diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-28 16:40:01 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-28 16:40:46 +0100 |
| commit | c6d1409185743c34e1c1688019c71e35e7f0e9ac (patch) | |
| tree | 33f9db99f3353e8749d84d9a026329c70c0cc50e | |
| parent | 5ab246b492fc5f4c5c90ab31a18cfeeb4c328632 (diff) | |
Fix tab vs spaces
| -rw-r--r-- | i386/i386/cpu_number.h | 2 | ||||
| -rw-r--r-- | i386/i386/db_interface.c | 8 | ||||
| -rw-r--r-- | i386/i386/db_trace.c | 8 | ||||
| -rw-r--r-- | i386/i386/i386asm.sym | 10 | ||||
| -rw-r--r-- | i386/i386/setjmp.h | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/i386/i386/cpu_number.h b/i386/i386/cpu_number.h index f13056fd..f32a44b8 100644 --- a/i386/i386/cpu_number.h +++ b/i386/i386/cpu_number.h @@ -37,7 +37,7 @@ #define CX(addr, reg) addr(,reg,4) #endif #ifdef __x86_64__ -#define CX(addr, reg) addr(,reg,8) +#define CX(addr, reg) addr(,reg,8) #endif #else /* NCPUS == 1 */ diff --git a/i386/i386/db_interface.c b/i386/i386/db_interface.c index 2db60b4b..0acca64f 100644 --- a/i386/i386/db_interface.c +++ b/i386/i386/db_interface.c @@ -388,8 +388,8 @@ kdb_kentry( ddb_regs.edi = int_regs->edi; #endif #ifdef __x86_64__ - ddb_regs.esi = is->rsi; - ddb_regs.edi = is->rdi; + ddb_regs.esi = is->rsi; + ddb_regs.edi = is->rdi; #endif ddb_regs.ds = is->ds; ddb_regs.es = is->es; @@ -417,8 +417,8 @@ kdb_kentry( int_regs->edi = ddb_regs.edi; #endif #ifdef __x86_64__ - is->rsi = ddb_regs.esi; - is->rdi = ddb_regs.edi; + is->rsi = ddb_regs.esi; + is->rdi = ddb_regs.edi; #endif is->ds = ddb_regs.ds & 0xffff; is->es = ddb_regs.es & 0xffff; diff --git a/i386/i386/db_trace.c b/i386/i386/db_trace.c index de324171..6c59864a 100644 --- a/i386/i386/db_trace.c +++ b/i386/i386/db_trace.c @@ -105,10 +105,10 @@ struct i386_kregs { { "esi", (long)(&((struct i386_kernel_state *)0)->k_esi) }, #endif #ifdef __x86_64__ - { "r12", (long)(&((struct i386_kernel_state *)0)->k_r12) }, - { "r13", (long)(&((struct i386_kernel_state *)0)->k_r13) }, - { "r14", (long)(&((struct i386_kernel_state *)0)->k_r14) }, - { "r15", (long)(&((struct i386_kernel_state *)0)->k_r15) }, + { "r12", (long)(&((struct i386_kernel_state *)0)->k_r12) }, + { "r13", (long)(&((struct i386_kernel_state *)0)->k_r13) }, + { "r14", (long)(&((struct i386_kernel_state *)0)->k_r14) }, + { "r15", (long)(&((struct i386_kernel_state *)0)->k_r15) }, #endif { "eip", (long)(&((struct i386_kernel_state *)0)->k_eip) }, { 0 }, diff --git a/i386/i386/i386asm.sym b/i386/i386/i386asm.sym index 9485f97a..0662aea0 100644 --- a/i386/i386/i386asm.sym +++ b/i386/i386/i386asm.sym @@ -69,10 +69,10 @@ expr &STACK_IKS(0)->k_edi KSS_EDI #endif expr &STACK_IKS(0)->k_eip KSS_EIP #ifdef __x86_64__ -expr &STACK_IKS(0)->k_r12 KSS_R12 -expr &STACK_IKS(0)->k_r13 KSS_R13 -expr &STACK_IKS(0)->k_r14 KSS_R14 -expr &STACK_IKS(0)->k_r15 KSS_R15 +expr &STACK_IKS(0)->k_r12 KSS_R12 +expr &STACK_IKS(0)->k_r13 KSS_R13 +expr &STACK_IKS(0)->k_r14 KSS_R14 +expr &STACK_IKS(0)->k_r15 KSS_R15 #endif size i386_kernel_state iks @@ -88,7 +88,7 @@ offset i386_saved_state r eip offset i386_saved_state r cr2 offset i386_saved_state r edi #ifdef __x86_64__ -offset i386_saved_state r r15 +offset i386_saved_state r r15 #endif offset i386_interrupt_state i eip diff --git a/i386/i386/setjmp.h b/i386/i386/setjmp.h index 0db56ae1..eacc8e45 100644 --- a/i386/i386/setjmp.h +++ b/i386/i386/setjmp.h @@ -33,7 +33,7 @@ typedef struct jmp_buf { #ifdef __i386__ int jmp_buf[6]; /* ebx, esi, edi, ebp, esp, eip */ #else - long jmp_buf[8]; /* rbx, rbp, r12, r13, r14, r15, rsp, rip */ + long jmp_buf[8]; /* rbx, rbp, r12, r13, r14, r15, rsp, rip */ #endif } jmp_buf_t; |