diff options
author | kevlo <kevlo@FreeBSD.org> | 2008-04-08 10:24:42 +0000 |
---|---|---|
committer | kevlo <kevlo@FreeBSD.org> | 2008-04-08 10:24:42 +0000 |
commit | bb2376b552530f062f337d52a79f0a1b43fc9070 (patch) | |
tree | 12a60faa9a040eac7bd538ae7d1d8290aba7135c | |
parent | 133f8f77986856cbe2c7c9445eb3bacfcd5d9ec2 (diff) | |
download | FreeBSD-src-bb2376b552530f062f337d52a79f0a1b43fc9070.zip FreeBSD-src-bb2376b552530f062f337d52a79f0a1b43fc9070.tar.gz |
Remove some long-dead code
Reviewed by: cognet
-rw-r--r-- | sys/arm/arm/exception.S | 5 | ||||
-rw-r--r-- | sys/arm/arm/locore.S | 37 | ||||
-rw-r--r-- | sys/arm/sa11x0/assabet_machdep.c | 5 | ||||
-rw-r--r-- | sys/arm/xscale/i80321/ep80219_machdep.c | 4 | ||||
-rw-r--r-- | sys/arm/xscale/i80321/iq31244_machdep.c | 4 | ||||
-rw-r--r-- | sys/arm/xscale/i8134x/crb_machdep.c | 4 | ||||
-rw-r--r-- | sys/arm/xscale/ixp425/avila_machdep.c | 4 |
7 files changed, 1 insertions, 62 deletions
diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S index 0d21fb4..30df0b1 100644 --- a/sys/arm/arm/exception.S +++ b/sys/arm/arm/exception.S @@ -234,11 +234,6 @@ ENTRY_NP(undefinedinstruction_bounce) .data .align 0 -#ifdef IPKDB -Lipkdb_trap_return_data: - .word 0 -#endif - /* * Indirection data * 2 words use for preserving r0 and r1 diff --git a/sys/arm/arm/locore.S b/sys/arm/arm/locore.S index ab8f111..b25888a 100644 --- a/sys/arm/arm/locore.S +++ b/sys/arm/arm/locore.S @@ -283,43 +283,6 @@ ENTRY_NP(cpu_halt) .word _C_LABEL(cpu_reset_needs_v4_MMU_disable) -#ifdef IPKDB -/* - * Execute(inst, psr, args, sp) - * - * Execute INSTruction with PSR and ARGS[0] - ARGS[3] making - * available stack at SP for next undefined instruction trap. - * - * Move the instruction onto the stack and jump to it. - */ -ENTRY_NP(Execute) - mov ip, sp - stmfd sp!, {r2, r4-r7, fp, ip, lr, pc} - sub fp, ip, #4 - mov ip, r3 - ldr r7, .Lreturn - stmfd sp!, {r0, r7} - adr r7, #.LExec - mov r5, r1 - mrs r4, cpsr - ldmia r2, {r0-r3} - mov r6, sp - mov sp, ip - msr cpsr_all, r5 - mov pc, r6 -.LExec: - mrs r5, cpsr -/* XXX Cannot switch thus easily back from user mode */ - msr cpsr_all, r4 - add sp, r6, #8 - ldmfd sp!, {r6} - stmia r6, {r0-r3} - mov r0, r5 - ldmdb fp, {r4-r7, fp, sp, pc} -.Lreturn: - mov pc, r7 -#endif - /* * setjump + longjmp */ diff --git a/sys/arm/sa11x0/assabet_machdep.c b/sys/arm/sa11x0/assabet_machdep.c index 9242d0d..f5272a3 100644 --- a/sys/arm/sa11x0/assabet_machdep.c +++ b/sys/arm/sa11x0/assabet_machdep.c @@ -110,11 +110,8 @@ __FBSDID("$FreeBSD$"); /* Define various stack sizes in pages */ #define IRQ_STACK_SIZE 1 #define ABT_STACK_SIZE 1 -#ifdef IPKDB -#define UND_STACK_SIZE 2 -#else #define UND_STACK_SIZE 1 -#endif + #define KERNEL_VM_BASE (KERNBASE + 0x00100000) #define KERNEL_VM_SIZE 0x05000000 diff --git a/sys/arm/xscale/i80321/ep80219_machdep.c b/sys/arm/xscale/i80321/ep80219_machdep.c index a3815ca..2732036 100644 --- a/sys/arm/xscale/i80321/ep80219_machdep.c +++ b/sys/arm/xscale/i80321/ep80219_machdep.c @@ -109,11 +109,7 @@ __FBSDID("$FreeBSD$"); /* Define various stack sizes in pages */ #define IRQ_STACK_SIZE 1 #define ABT_STACK_SIZE 1 -#ifdef IPKDB -#define UND_STACK_SIZE 2 -#else #define UND_STACK_SIZE 1 -#endif extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; diff --git a/sys/arm/xscale/i80321/iq31244_machdep.c b/sys/arm/xscale/i80321/iq31244_machdep.c index 73a2065..3f23cb6 100644 --- a/sys/arm/xscale/i80321/iq31244_machdep.c +++ b/sys/arm/xscale/i80321/iq31244_machdep.c @@ -109,11 +109,7 @@ __FBSDID("$FreeBSD$"); /* Define various stack sizes in pages */ #define IRQ_STACK_SIZE 1 #define ABT_STACK_SIZE 1 -#ifdef IPKDB -#define UND_STACK_SIZE 2 -#else #define UND_STACK_SIZE 1 -#endif extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; diff --git a/sys/arm/xscale/i8134x/crb_machdep.c b/sys/arm/xscale/i8134x/crb_machdep.c index 0291469..08205b1 100644 --- a/sys/arm/xscale/i8134x/crb_machdep.c +++ b/sys/arm/xscale/i8134x/crb_machdep.c @@ -113,11 +113,7 @@ __FBSDID("$FreeBSD$"); /* Define various stack sizes in pages */ #define IRQ_STACK_SIZE 1 #define ABT_STACK_SIZE 1 -#ifdef IPKDB -#define UND_STACK_SIZE 2 -#else #define UND_STACK_SIZE 1 -#endif extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; diff --git a/sys/arm/xscale/ixp425/avila_machdep.c b/sys/arm/xscale/ixp425/avila_machdep.c index 6aed195..1ed89aa 100644 --- a/sys/arm/xscale/ixp425/avila_machdep.c +++ b/sys/arm/xscale/ixp425/avila_machdep.c @@ -108,11 +108,7 @@ __FBSDID("$FreeBSD$"); /* Define various stack sizes in pages */ #define IRQ_STACK_SIZE 1 #define ABT_STACK_SIZE 1 -#ifdef IPKDB -#define UND_STACK_SIZE 2 -#else #define UND_STACK_SIZE 1 -#endif extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; |