[Qemu-devel] [PATCH 08/10] target-mips: add microMIPS exception handler support

2010-05-20 Thread Nathan Froyd 
Unlike MIPS16, microMIPS lets you choose the ISA mode for your exception
handlers.

Signed-off-by: Nathan Froyd 
---
 target-mips/helper.c |   21 +++--
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/target-mips/helper.c b/target-mips/helper.c
index 8102f03..90c3b3a 100644
--- a/target-mips/helper.c
+++ b/target-mips/helper.c
@@ -385,6 +385,18 @@ static target_ulong exception_resume_pc (CPUState *env)
 
 return bad_pc;
 }
+static void set_hflags_for_handler (CPUState *env)
+{
+/* Exception handlers are entered in 32-bit mode.  */
+env->hflags &= ~(MIPS_HFLAG_M16);
+/* ...except that microMIPS lets you choose.  */
+if (env->insn_flags & ASE_MICROMIPS) {
+env->hflags |= (!!(env->CP0_Config3
+   & (1 << CP0C3_ISA_ON_EXC))
+<< MIPS_HFLAG_M16_SHIFT);
+}
+}
+
 #endif
 
 void do_interrupt (CPUState *env)
@@ -440,8 +452,7 @@ void do_interrupt (CPUState *env)
 if (!(env->CP0_Status & (1 << CP0St_EXL)))
 env->CP0_Cause &= ~(1 << CP0Ca_BD);
 env->active_tc.PC = (int32_t)0xBFC00480;
-/* Exception handlers are entered in 32-bit mode.  */
-env->hflags &= ~(MIPS_HFLAG_M16);
+set_hflags_for_handler(env);
 break;
 case EXCP_RESET:
 cpu_reset(env);
@@ -461,8 +472,7 @@ void do_interrupt (CPUState *env)
 if (!(env->CP0_Status & (1 << CP0St_EXL)))
 env->CP0_Cause &= ~(1 << CP0Ca_BD);
 env->active_tc.PC = (int32_t)0xBFC0;
-/* Exception handlers are entered in 32-bit mode.  */
-env->hflags &= ~(MIPS_HFLAG_M16);
+set_hflags_for_handler(env);
 break;
 case EXCP_EXT_INTERRUPT:
 cause = 0;
@@ -581,8 +591,7 @@ void do_interrupt (CPUState *env)
 env->active_tc.PC = (int32_t)(env->CP0_EBase & ~0x3ff);
 }
 env->active_tc.PC += offset;
-/* Exception handlers are entered in 32-bit mode.  */
-env->hflags &= ~(MIPS_HFLAG_M16);
+set_hflags_for_handler(env);
 env->CP0_Cause = (env->CP0_Cause & ~(0x1f << CP0Ca_EC)) | (cause << 
CP0Ca_EC);
 break;
 default:
-- 
1.6.3.2

[Qemu-devel] [PATCH 08/10] target-mips: add microMIPS exception handler support

2010-05-24 Thread Nathan Froyd 
Unlike MIPS16, microMIPS lets you choose the ISA mode for your exception
handlers.

Signed-off-by: Nathan Froyd 
---
 target-mips/helper.c |   21 +++--
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/target-mips/helper.c b/target-mips/helper.c
index 8102f03..90c3b3a 100644
--- a/target-mips/helper.c
+++ b/target-mips/helper.c
@@ -385,6 +385,18 @@ static target_ulong exception_resume_pc (CPUState *env)
 
 return bad_pc;
 }
+static void set_hflags_for_handler (CPUState *env)
+{
+/* Exception handlers are entered in 32-bit mode.  */
+env->hflags &= ~(MIPS_HFLAG_M16);
+/* ...except that microMIPS lets you choose.  */
+if (env->insn_flags & ASE_MICROMIPS) {
+env->hflags |= (!!(env->CP0_Config3
+   & (1 << CP0C3_ISA_ON_EXC))
+<< MIPS_HFLAG_M16_SHIFT);
+}
+}
+
 #endif
 
 void do_interrupt (CPUState *env)
@@ -440,8 +452,7 @@ void do_interrupt (CPUState *env)
 if (!(env->CP0_Status & (1 << CP0St_EXL)))
 env->CP0_Cause &= ~(1 << CP0Ca_BD);
 env->active_tc.PC = (int32_t)0xBFC00480;
-/* Exception handlers are entered in 32-bit mode.  */
-env->hflags &= ~(MIPS_HFLAG_M16);
+set_hflags_for_handler(env);
 break;
 case EXCP_RESET:
 cpu_reset(env);
@@ -461,8 +472,7 @@ void do_interrupt (CPUState *env)
 if (!(env->CP0_Status & (1 << CP0St_EXL)))
 env->CP0_Cause &= ~(1 << CP0Ca_BD);
 env->active_tc.PC = (int32_t)0xBFC0;
-/* Exception handlers are entered in 32-bit mode.  */
-env->hflags &= ~(MIPS_HFLAG_M16);
+set_hflags_for_handler(env);
 break;
 case EXCP_EXT_INTERRUPT:
 cause = 0;
@@ -581,8 +591,7 @@ void do_interrupt (CPUState *env)
 env->active_tc.PC = (int32_t)(env->CP0_EBase & ~0x3ff);
 }
 env->active_tc.PC += offset;
-/* Exception handlers are entered in 32-bit mode.  */
-env->hflags &= ~(MIPS_HFLAG_M16);
+set_hflags_for_handler(env);
 env->CP0_Cause = (env->CP0_Cause & ~(0x1f << CP0Ca_EC)) | (cause << 
CP0Ca_EC);
 break;
 default:
-- 
1.6.3.2

Re: [Qemu-devel] [PATCH 08/10] target-mips: add microMIPS exception handler support

2010-06-04 Thread Richard Henderson 
On 05/24/2010 09:19 AM, Nathan Froyd wrote:
>  return bad_pc;
>  }
> +static void set_hflags_for_handler (CPUState *env)
> +{

Missing vertical space between functions.


r~