d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move panic_bad_hcall to its use site in support.S in attempt to un-break the

Browse Source 
tinderbox
This commit is contained in:
Kip Macy 2006-11-08 22:16:05 +00:00
parent dc4468ed17
commit 42013c462c
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/sun4v/sun4v/hcall.S
View File

@ -1401,27 +1401,6 @@ hv_hpriv(void *func, uint64_t arg1, uint64_t arg2, uint64_t arg3)
nop
SET_SIZE(hv_hpriv)
/*
* panic_bad_hcall is called when a hcall returns
* unexpected error
* %o0 error number
* %o1 hcall number
*/
.text
bad_hcall_error:
.asciz "hypervisor call 0x%x returned an unexpected error %d"
ENTRY(panic_bad_hcall)
mov %o0, %o2
sethi %hi(bad_hcall_error), %o0
or %o0, %lo(bad_hcall_error), %o0
mov %o7, %o3
call panic
mov %o3, %o7
SET_SIZE(panic_bad_hcall)
ENTRY(hv_magic_trap_on)
ta 0x77
retl

30
sys/sun4v/sun4v/support.S
View File

@ -729,7 +729,7 @@ ENTRY(invlpg)
ta FAST_TRAP
brz,pt %o0, 1f
nop
ba panic_bad_hcall
ba,pt %xcc, panic_bad_hcall
mov MMU_DEMAP_PAGE, %o1
1:
retl
@ -756,7 +756,7 @@ ENTRY(invlctx)
ta FAST_TRAP
brz,pt %o0, 1f
nop
ba panic_bad_hcall
ba,pt %xcc, panic_bad_hcall
mov MMU_DEMAP_CTX, %o1
1:
retl
@ -771,13 +771,37 @@ ENTRY(invltlb)
ta FAST_TRAP
brz,pt %o0, 1f
nop
ba panic_bad_hcall
ba,pt %xcc, panic_bad_hcall
mov MMU_DEMAP_ALL, %o1
1:
retl
nop
END(invltlb)
/*
* panic_bad_hcall is called when a hcall returns
* unexpected error
* %o0 error number
* %o1 hcall number
*/
.text
bad_hcall_error:
.asciz "hypervisor call 0x%x returned an unexpected error %d"
ENTRY(panic_bad_hcall)
mov %o0, %o2
sethi %hi(bad_hcall_error), %o0
or %o0, %lo(bad_hcall_error), %o0
mov %o7, %o3
call panic
mov %o3, %o7
SET_SIZE(panic_bad_hcall)
! %o0 = pa
! %o1 = size