src - FreeBSD source tree

diff options


context:
space:
mode:

author	Peter Grehan <grehan@FreeBSD.org>	2004-02-04 13:00:56 +0000
committer	Peter Grehan <grehan@FreeBSD.org>	2004-02-04 13:00:56 +0000
commit	a6d91166658bb031516c01d4960bcc68f3401839 (patch)
tree	a2cc9b8a40bca545147ff98fd07c11edbbb5b0e5 /sys
parent	aa6bcb7d23ee5fcf200e1b9071d7a219fa7b5480 (diff)
download	src-a6d91166658bb031516c01d4960bcc68f3401839.tar.gz src-a6d91166658bb031516c01d4960bcc68f3401839.zip

- remove unused trap definitions

- ISI traps are now handled by the generic trap routine - direct diagnostic traps to DDB if defined - remove unused asngen pcpu init

Notes

Notes: svn path=/head/; revision=125440

Diffstat (limited to 'sys')

-rw-r--r--

sys/powerpc/aim/machdep.c

-rw-r--r--

sys/powerpc/powerpc/machdep.c

2 files changed, 22 insertions, 12 deletions

diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c
index b8b68abe6f73..e87851aea986 100644
--- a/sys/powerpc/aim/machdep.c
+++ b/sys/powerpc/aim/machdep.c

@@ -234,12 +234,9 @@ extern char kernel_text[], _end[];

extern void *trapcode, *trapsize;

extern void *alitrap, *alisize;

extern void *dsitrap, *dsisize;

-extern void *isitrap, *isisize;

extern void *decrint, *decrsize;

-extern void *tlbimiss, *tlbimsize;

-extern void *tlbdlmiss, *tlbdlmsize;

-extern void *tlbdsmiss, *tlbdsmsize;

extern void *extint, *extsize;

+extern void *ddblow, *ddbsize;

void

powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp)

@@ -284,9 +281,10 @@ powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp)

* XXX: Initialize the interrupt tables.

+ bcopy(&trapcode, (void *)EXC_RST, (size_t)&trapsize);

bcopy(&trapcode, (void *)EXC_MCHK, (size_t)&trapsize);

bcopy(&dsitrap, (void *)EXC_DSI, (size_t)&dsisize);

- bcopy(&isitrap, (void *)EXC_ISI, (size_t)&isisize);

+ bcopy(&trapcode, (void *)EXC_ISI, (size_t)&trapsize);

bcopy(&trapcode, (void *)EXC_EXI, (size_t)&trapsize);

bcopy(&trapcode, (void *)EXC_ALI, (size_t)&trapsize);

bcopy(&trapcode, (void *)EXC_PGM, (size_t)&trapsize);

@@ -294,6 +292,14 @@ powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp)

bcopy(&trapcode, (void *)EXC_DECR, (size_t)&trapsize);

bcopy(&trapcode, (void *)EXC_SC, (size_t)&trapsize);

bcopy(&trapcode, (void *)EXC_TRC, (size_t)&trapsize);

+ bcopy(&trapcode, (void *)EXC_FPA, (size_t)&trapsize);

+ bcopy(&trapcode, (void *)EXC_THRM, (size_t)&trapsize);

+ bcopy(&trapcode, (void *)EXC_BPT, (size_t)&trapsize);

+#ifdef DDB

+ bcopy(&ddblow, (void *)EXC_PGM, (size_t)&ddbsize);

+ bcopy(&ddblow, (void *)EXC_TRC, (size_t)&ddbsize);

+ bcopy(&ddblow, (void *)EXC_BPT, (size_t)&ddbsize);

+#endif

__syncicache(EXC_RSVD, EXC_LAST - EXC_RSVD);

@@ -735,7 +741,6 @@ void

cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t sz)

{

- pcpu->pc_current_asngen = 1;

}

diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c
index b8b68abe6f73..e87851aea986 100644
--- a/sys/powerpc/powerpc/machdep.c
+++ b/sys/powerpc/powerpc/machdep.c