socsvn commit: r288274 - soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm

[mihai at FreeBSD.org]

Author: mihai
Date: Mon Jul 13 08:47:03 2015
New Revision: 288274
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288274

Log:
  soc2015: mihai: bhyve: sys: arm: vmm: hyp.S: fix HCR load and add a stub push

Modified:
  soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S

Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S
==============================================================================
--- soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S	Mon Jul 13 08:45:41 2015	(r288273)
+++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S	Mon Jul 13 08:47:03 2015	(r288274)
@@ -68,7 +68,6 @@
 	orr     r1, r1, r2
 	mcr     p15, 4, r1, c1, c1, 2
 
-
 	restore_guest_regs
 
 	eret
@@ -100,7 +99,7 @@
 
 	/* Disable all traps - HCR */
 	mov	r2, #0
-	mcr	p15, 4, r1, c1, c1, 0
+	mcr	p15, 4, r2, c1, c1, 0
 
 
 	/* Save guest CP15 registers */
@@ -333,6 +332,7 @@
 	eret
 
 guest_bad_exception:
+	push	{r0, r1, r2}		@ Emulate a push to the stack to respect hyp_exit_guest restore convention
 	/* Load hypctx pointer to r0 */
 	mrc	p15, 4, r0, c13, c0, 2
 	// TODO: load HSR in VCPU