system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-20 07:14:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

The arm exception entry points currently vector through a function pointer

Browse source 
to the actual handler routine.  All the pointers are static-intialized to
the only handlers available, and yet various platform-specific inits still
set those pointers (to the values they're already initialized to).  Begin
to drain the swamp by removing all the redundant external declarations and
runtime setting of the pointers that's scattered around various places.
This commit is contained in:
Ian Lepore 2014-03-09 18:08:27 +00:00
parent 4ce4252794
commit 510ccb2fd4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=262952
11 changed files with 0 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/arm/arm/machdep.c
View file

@ -143,10 +143,6 @@ extern vm_offset_t ksym_start, ksym_end;
static struct pv_addr kernel_pt_table[KERNEL_PT_MAX]; static struct pv_addr kernel_pt_table[KERNEL_PT_MAX];
extern u_int data_abort_handler_address;
extern u_int prefetch_abort_handler_address;
extern u_int undefined_handler_address;
vm_paddr_t pmap_pa; vm_paddr_t pmap_pa;
struct pv_addr systempage; struct pv_addr systempage;
@ -1279,10 +1275,6 @@ initarm(struct arm_boot_params *abp)
*/ */
cpu_idcache_wbinv_all(); cpu_idcache_wbinv_all();
/* Set stack for exception handlers */
data_abort_handler_address = (u_int)data_abort_handler;
prefetch_abort_handler_address = (u_int)prefetch_abort_handler;
undefined_handler_address = (u_int)undefinedinstruction_bounce;
undefined_init(); undefined_init();
init_proc0(kernelstack.pv_va); init_proc0(kernelstack.pv_va);

1
sys/arm/arm/trap.c
View file

@ -126,7 +126,6 @@ __FBSDID("$FreeBSD$");
void swi_handler(struct trapframe *); void swi_handler(struct trapframe *);
void undefinedinstruction(struct trapframe *);
#include <machine/disassem.h> #include <machine/disassem.h>
#include <machine/machdep.h> #include <machine/machdep.h>

9
sys/arm/at91/at91_machdep.c
View file

@ -111,10 +111,6 @@ __FBSDID("$FreeBSD$");
/* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */ /* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */
#define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM) #define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM)
extern u_int data_abort_handler_address;
extern u_int prefetch_abort_handler_address;
extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
/* Static device mappings. */ /* Static device mappings. */
@ -621,11 +617,6 @@ initarm(struct arm_boot_params *abp)
*/ */
cpu_idcache_wbinv_all(); cpu_idcache_wbinv_all();
/* Set stack for exception handlers */
data_abort_handler_address = (u_int)data_abort_handler;
prefetch_abort_handler_address = (u_int)prefetch_abort_handler;
undefined_handler_address = (u_int)undefinedinstruction_bounce;
undefined_init(); undefined_init();
init_proc0(kernelstack.pv_va); init_proc0(kernelstack.pv_va);

8
sys/arm/econa/econa_machdep.c
View file

@ -91,10 +91,6 @@ __FBSDID("$FreeBSD$");
/* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */ /* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */
#define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM) #define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM)
extern u_int data_abort_handler_address;
extern u_int prefetch_abort_handler_address;
extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
/* Physical and virtual addresses for some global pages */ /* Physical and virtual addresses for some global pages */
@ -309,10 +305,6 @@ initarm(struct arm_boot_params *abp)
cpu_idcache_wbinv_all(); cpu_idcache_wbinv_all();
cpu_setup(""); cpu_setup("");
/* Set stack for exception handlers */
data_abort_handler_address = (u_int)data_abort_handler;
prefetch_abort_handler_address = (u_int)prefetch_abort_handler;
undefined_handler_address = (u_int)undefinedinstruction_bounce;
undefined_init(); undefined_init();
init_proc0(kernelstack.pv_va); init_proc0(kernelstack.pv_va);

8
sys/arm/s3c2xx0/s3c24x0_machdep.c
View file

@ -106,10 +106,6 @@ __FBSDID("$FreeBSD$");
extern int s3c2410_pclk; extern int s3c2410_pclk;
extern u_int data_abort_handler_address;
extern u_int prefetch_abort_handler_address;
extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
/* Physical and virtual addresses for some global pages */ /* Physical and virtual addresses for some global pages */
@ -372,10 +368,6 @@ initarm(struct arm_boot_params *abp)
} }
cninit(); cninit();
/* Set stack for exception handlers */
data_abort_handler_address = (u_int)data_abort_handler;
prefetch_abort_handler_address = (u_int)prefetch_abort_handler;
undefined_handler_address = (u_int)undefinedinstruction_bounce;
undefined_init(); undefined_init();
init_proc0(kernelstack.pv_va); init_proc0(kernelstack.pv_va);

7
sys/arm/sa11x0/assabet_machdep.c
View file

@ -109,10 +109,6 @@ __FBSDID("$FreeBSD$");
#define KERNEL_VM_BASE (KERNBASE + 0x00100000) #define KERNEL_VM_BASE (KERNBASE + 0x00100000)
#define KERNEL_VM_SIZE 0x05000000 #define KERNEL_VM_SIZE 0x05000000
extern u_int data_abort_handler_address;
extern u_int prefetch_abort_handler_address;
extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
extern vm_offset_t sa1110_uart_vaddr; extern vm_offset_t sa1110_uart_vaddr;
@ -329,9 +325,6 @@ initarm(struct arm_boot_params *abp)
pmap_map_chunk(l1pagetable, sa1_cache_clean_addr, 0xf0000000, pmap_map_chunk(l1pagetable, sa1_cache_clean_addr, 0xf0000000,
CPU_SA110_CACHE_CLEAN_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); CPU_SA110_CACHE_CLEAN_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
data_abort_handler_address = (u_int)data_abort_handler;
prefetch_abort_handler_address = (u_int)prefetch_abort_handler;
undefined_handler_address = (u_int)undefinedinstruction_bounce;
undefined_init(); undefined_init();
cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT); cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT);
setttb(kernel_l1pt.pv_pa); setttb(kernel_l1pt.pv_pa);

9
sys/arm/xscale/i80321/ep80219_machdep.c
View file

@ -103,10 +103,6 @@ __FBSDID("$FreeBSD$");
/* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */ /* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */
#define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM) #define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM)
extern u_int data_abort_handler_address;
extern u_int prefetch_abort_handler_address;
extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
/* Physical and virtual addresses for some global pages */ /* Physical and virtual addresses for some global pages */
@ -321,11 +317,6 @@ initarm(struct arm_boot_params *abp)
physmem = memsize / PAGE_SIZE; physmem = memsize / PAGE_SIZE;
cninit(); cninit();
/* Set stack for exception handlers */
data_abort_handler_address = (u_int)data_abort_handler;
prefetch_abort_handler_address = (u_int)prefetch_abort_handler;
undefined_handler_address = (u_int)undefinedinstruction_bounce;
undefined_init(); undefined_init();
init_proc0(kernelstack.pv_va); init_proc0(kernelstack.pv_va);

9
sys/arm/xscale/i80321/iq31244_machdep.c
View file

@ -103,10 +103,6 @@ __FBSDID("$FreeBSD$");
/* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */ /* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */
#define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM) #define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM)
extern u_int data_abort_handler_address;
extern u_int prefetch_abort_handler_address;
extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
/* Physical and virtual addresses for some global pages */ /* Physical and virtual addresses for some global pages */
@ -322,11 +318,6 @@ initarm(struct arm_boot_params *abp)
physmem = memsize / PAGE_SIZE; physmem = memsize / PAGE_SIZE;
cninit(); cninit();
/* Set stack for exception handlers */
data_abort_handler_address = (u_int)data_abort_handler;
prefetch_abort_handler_address = (u_int)prefetch_abort_handler;
undefined_handler_address = (u_int)undefinedinstruction_bounce;
undefined_init(); undefined_init();
init_proc0(kernelstack.pv_va); init_proc0(kernelstack.pv_va);

7
sys/arm/xscale/i8134x/crb_machdep.c
View file

@ -106,10 +106,6 @@ __FBSDID("$FreeBSD$");
/* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */ /* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */
#define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM) #define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM)
extern u_int data_abort_handler_address;
extern u_int prefetch_abort_handler_address;
extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
/* Physical and virtual addresses for some global pages */ /* Physical and virtual addresses for some global pages */
@ -302,9 +298,6 @@ initarm(struct arm_boot_params *abp)
cninit(); cninit();
/* Set stack for exception handlers */ /* Set stack for exception handlers */
data_abort_handler_address = (u_int)data_abort_handler;
prefetch_abort_handler_address = (u_int)prefetch_abort_handler;
undefined_handler_address = (u_int)undefinedinstruction_bounce;
undefined_init(); undefined_init();
init_proc0(kernelstack.pv_va); init_proc0(kernelstack.pv_va);

9
sys/arm/xscale/ixp425/avila_machdep.c
View file

@ -102,10 +102,6 @@ __FBSDID("$FreeBSD$");
/* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */ /* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */
#define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM) #define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM)
extern u_int data_abort_handler_address;
extern u_int prefetch_abort_handler_address;
extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
/* Physical and virtual addresses for some global pages */ /* Physical and virtual addresses for some global pages */
@ -393,11 +389,6 @@ initarm(struct arm_boot_params *abp)
else else
memsize = ixp425_sdram_size(); memsize = ixp425_sdram_size();
/* Set stack for exception handlers */
data_abort_handler_address = (u_int)data_abort_handler;
prefetch_abort_handler_address = (u_int)prefetch_abort_handler;
undefined_handler_address = (u_int)undefinedinstruction_bounce;
undefined_init(); undefined_init();
init_proc0(kernelstack.pv_va); init_proc0(kernelstack.pv_va);

8
sys/arm/xscale/pxa/pxa_machdep.c
View file

@ -103,10 +103,6 @@ __FBSDID("$FreeBSD$");
/* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */ /* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */
#define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM) #define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM)
extern u_int data_abort_handler_address;
extern u_int prefetch_abort_handler_address;
extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
/* Physical and virtual addresses for some global pages */ /* Physical and virtual addresses for some global pages */
@ -311,10 +307,6 @@ initarm(struct arm_boot_params *abp)
/* Fire up consoles. */ /* Fire up consoles. */
cninit(); cninit();
/* Set stack for exception handlers */
data_abort_handler_address = (u_int)data_abort_handler;
prefetch_abort_handler_address = (u_int)prefetch_abort_handler;
undefined_handler_address = (u_int)undefinedinstruction_bounce;
undefined_init(); undefined_init();
init_proc0(kernelstack.pv_va); init_proc0(kernelstack.pv_va);