diff options
| author | marcel <marcel@FreeBSD.org> | 2014-07-02 23:37:14 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2014-07-02 23:37:14 +0000 |
| commit | e7195b2eb0e74548094085601f0eb8e0a0c5f09f (patch) | |
| tree | 7590e19416f631820ce7c75093b46def1ff6dc46 /sys/ia64 | |
| parent | e507d756a8702cfef68af0a8ae8b150bbfdfbf06 (diff) | |
| download | FreeBSD-src-e7195b2eb0e74548094085601f0eb8e0a0c5f09f.zip FreeBSD-src-e7195b2eb0e74548094085601f0eb8e0a0c5f09f.tar.gz | |
MFC r263254: Move the implementation of kdb_cpu_trap() from <machine/kdb.h>
to machdep.c.
Diffstat (limited to 'sys/ia64')
| -rw-r--r-- | sys/ia64/ia64/machdep.c | 13 | ||||
| -rw-r--r-- | sys/ia64/include/kdb.h | 12 |
2 files changed, 15 insertions, 10 deletions
diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c index 92bbc64c..ad4270b 100644 --- a/sys/ia64/ia64/machdep.c +++ b/sys/ia64/ia64/machdep.c @@ -86,6 +86,7 @@ __FBSDID("$FreeBSD$"); #include <machine/elf.h> #include <machine/fpu.h> #include <machine/intr.h> +#include <machine/kdb.h> #include <machine/mca.h> #include <machine/md_var.h> #include <machine/pal.h> @@ -562,6 +563,18 @@ spinlock_exit(void) } void +kdb_cpu_trap(int vector, int code __unused) +{ + + __asm __volatile("flushrs;;"); + + /* Restart after the break instruction. */ + if (vector == IA64_VEC_BREAK && + kdb_frame->tf_special.ifa == IA64_FIXED_BREAK) + kdb_frame->tf_special.psr += IA64_PSR_RI_1; +} + +void map_vhpt(uintptr_t vhpt) { pt_entry_t pte; diff --git a/sys/ia64/include/kdb.h b/sys/ia64/include/kdb.h index 8a9cc3a..0304f51 100644 --- a/sys/ia64/include/kdb.h +++ b/sys/ia64/include/kdb.h @@ -35,6 +35,8 @@ #define KDB_STOPPEDPCB(pc) (&(pc)->pc_md.pcb) +void kdb_cpu_trap(int, int); + static __inline void kdb_cpu_clear_singlestep(void) { @@ -62,14 +64,4 @@ kdb_cpu_sync_icache(unsigned char *addr, size_t size) } } -static __inline void -kdb_cpu_trap(int vector, int _) -{ - __asm __volatile("flushrs;;"); - - if (vector == IA64_VEC_BREAK && - kdb_frame->tf_special.ifa == IA64_FIXED_BREAK) - kdb_frame->tf_special.psr += IA64_PSR_RI_1; -} - #endif /* _MACHINE_KDB_H_ */ |
