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

[mihai at FreeBSD.org]

Author: mihai
Date: Mon Jul 27 07:21:18 2015
New Revision: 288801
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=288801

Log:
  soc2015: mihai: bhyve-arm: sys: arm: vmm: hyp.S: handle irq exception

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 27 07:20:19 2015	(r288800)
+++ soc2015/mihai/bhyve-on-arm-head/sys/arm/vmm/hyp.S	Mon Jul 27 07:21:18 2015	(r288801)
@@ -311,10 +311,15 @@
 
 	.align
 hyp_fiq:
-	b loop
+	b	loop
+
 	.align
 hyp_irq:
-	b loop
+	push	{r0, r1, r2}		@ Save registers in order to use them
+	/* Load hypctx pointer to r0 */
+	mrc	p15, 4, r0, c13, c0, 2
+	mov	r1, #EXCEPTION_IRQ
+	b	hyp_exit_guest
 	.align
 
 ENTRY(handle_bad_exception)
@@ -337,7 +342,6 @@
 	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
 	b	hyp_exit_guest
 END(handle_bad_exception)