From 1bcab7872c6ae98ab86cdc1a3f567fd263e723d7 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Thu, 5 May 2016 17:07:04 -0700
Subject: Poll HTIF console on timer interrupt

---
 machine/mentry.S | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'machine/mentry.S')

diff --git a/machine/mentry.S b/machine/mentry.S
index 4895227..6bdc7e6 100644
--- a/machine/mentry.S
+++ b/machine/mentry.S
@@ -20,7 +20,9 @@ trap_table:
   .word bad_trap
 #define SOFTWARE_INTERRUPT_VECTOR 12
   .word software_interrupt
-#define TRAP_FROM_MACHINE_MODE_VECTOR 13
+#define TIMER_INTERRUPT_VECTOR 13
+  .word timer_interrupt
+#define TRAP_FROM_MACHINE_MODE_VECTOR 14
   .word __trap_from_machine_mode
 
   .option norvc
@@ -49,11 +51,8 @@ trap_vector:
   # Is it a machine timer interrupt?
   li a0, IRQ_M_TIMER * 2
   bne a0, a1, 1f
-  # Yes.  Post a supervisor timer interrupt.
-  li a0, MIP_MTIP
-  csrc mie, a0
-  li a0, MIP_STIP
-  csrs mip, a0
+  li a1, TIMER_INTERRUPT_VECTOR
+  j .Lhandle_trap_in_machine_mode
 
 .Lmret:
   # Go back whence we came.
-- 
cgit v1.1