Skip to contentSkip to conversation

target/m68k: Fix exception frame format for 68010

PATCH In review Daniel Palmer 5 participants 7 messages Jan 15, 2024 – Feb 23, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/m68k: Fix exception frame format for 68010

From the 68010 a word with the frame format and exception vector are placed on the stack before the PC and SR.

M68K_FEATURE_QUAD_MULDIV is currently checked to workout if to do this or not for the configured CPU but that flag isn't set for 68010 so currently the exception stack when 68010 is configured is incorrect.

It seems like checking M68K_FEATURE_MOVEFROMSR_PRIV would do but adding a new flag that shows exactly what is going on here is maybe clearer.

Add a new flag for the behaviour, M68K_FEATURE_EXCEPTION_FORMAT_VEC, and set it for 68010 and above, and then use it to control if the format and vector word are pushed/pop during exception entry/exit.

---
 target/m68k/cpu.c       | 4 +++-
 target/m68k/cpu.h       | 2 ++
 target/m68k/op_helper.c | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)
target/m68k/cpu.c +3 -1
index 1421e77c2c07..20718944b4c8 100644
@@ -137,7 +137,8 @@ static void m68000_cpu_initfn(Object *obj)
 }
 
 /*
- * Adds BKPT, MOVE-from-SR *now priv instr, and MOVEC, MOVES, RTD
+ * Adds BKPT, MOVE-from-SR *now priv instr, and MOVEC, MOVES, RTD,
+ *      format+vector in exception frame.
  */
 static void m68010_cpu_initfn(Object *obj)
 {
@@ -150,6 +151,7 @@ static void m68010_cpu_initfn(Object *obj)
     m68k_set_feature(env, M68K_FEATURE_BKPT);
     m68k_set_feature(env, M68K_FEATURE_MOVEC);
     m68k_set_feature(env, M68K_FEATURE_MOVEFROMSR_PRIV);
+    m68k_set_feature(env, M68K_FEATURE_EXCEPTION_FORMAT_VEC);
 }
 
 /*
target/m68k/cpu.h +2 -0
index d13427b0fe61..0fc591e618f6 100644
@@ -549,6 +549,8 @@ enum m68k_features {
     M68K_FEATURE_TRAPCC,
     /* MOVE from SR privileged (from 68010) */
     M68K_FEATURE_MOVEFROMSR_PRIV,
+    /* Exception frame with format+vector (from 68010) */
+    M68K_FEATURE_EXCEPTION_FORMAT_VEC,
 };
 
 static inline bool m68k_feature(CPUM68KState *env, int feature)
target/m68k/op_helper.c +2 -2
index 1ce850bbc594..b09771672dec 100644
@@ -52,7 +52,7 @@ throwaway:
     sp += 2;
     env->pc = cpu_ldl_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
     sp += 4;
-    if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) {
+    if (m68k_feature(env, M68K_FEATURE_EXCEPTION_FORMAT_VEC)) {
         /*  all except 68000 */
         fmt = cpu_lduw_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
         sp += 2;
@@ -256,7 +256,7 @@ static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp,
                                   uint16_t format, uint16_t sr,
                                   uint32_t addr, uint32_t retaddr)
 {
-    if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) {
+    if (m68k_feature(env, M68K_FEATURE_EXCEPTION_FORMAT_VEC)) {
         /*  all except 68000 */
         CPUState *cs = env_cpu(env);
         switch (format) {
Signature · 1 line
2.43.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 72 lines · Daniel Palmer

From the 68010 a word with the frame format and exception vector
are placed on the stack before the PC and SR.

M68K_FEATURE_QUAD_MULDIV is currently checked to workout if to do this or not for the configured CPU but that flag isn't set for 68010 so currently the exception stack when 68010 is configured is incorrect.

It seems like checking M68K_FEATURE_MOVEFROMSR_PRIV would do but adding a new flag that shows exactly what is going on here is maybe clearer.

Add a new flag for the behaviour, M68K_FEATURE_EXCEPTION_FORMAT_VEC, and set it for 68010 and above, and then use it to control if the format and vector word are pushed/pop during exception entry/exit.

---
  target/m68k/cpu.c       | 4 +++-
  target/m68k/cpu.h       | 2 ++
  target/m68k/op_helper.c | 4 ++--
  3 files changed, 7 insertions(+), 3 deletions(-)
target/m68k/cpu.c +3 -1
index 1421e77c2c07..20718944b4c8 100644
@@ -137,7 +137,8 @@ static void m68000_cpu_initfn(Object *obj)
  }
 
  /*
- * Adds BKPT, MOVE-from-SR *now priv instr, and MOVEC, MOVES, RTD
+ * Adds BKPT, MOVE-from-SR *now priv instr, and MOVEC, MOVES, RTD,
+ *      format+vector in exception frame.
   */
  static void m68010_cpu_initfn(Object *obj)
  {
@@ -150,6 +151,7 @@ static void m68010_cpu_initfn(Object *obj)
      m68k_set_feature(env, M68K_FEATURE_BKPT);
      m68k_set_feature(env, M68K_FEATURE_MOVEC);
      m68k_set_feature(env, M68K_FEATURE_MOVEFROMSR_PRIV);
+    m68k_set_feature(env, M68K_FEATURE_EXCEPTION_FORMAT_VEC);
  }
 
  /*
target/m68k/cpu.h +2 -0
index d13427b0fe61..0fc591e618f6 100644
@@ -549,6 +549,8 @@ enum m68k_features {
      M68K_FEATURE_TRAPCC,
      /* MOVE from SR privileged (from 68010) */
      M68K_FEATURE_MOVEFROMSR_PRIV,
+    /* Exception frame with format+vector (from 68010) */
+    M68K_FEATURE_EXCEPTION_FORMAT_VEC,
  };
 
  static inline bool m68k_feature(CPUM68KState *env, int feature)
target/m68k/op_helper.c +1 -1
index 1ce850bbc594..b09771672dec 100644
@@ -52,7 +52,7 @@ throwaway:
      sp += 2;
      env->pc = cpu_ldl_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
      sp += 4;
-    if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) {
+    if (m68k_feature(env, M68K_FEATURE_EXCEPTION_FORMAT_VEC)) {
          /*  all except 68000 */
          fmt = cpu_lduw_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
          sp += 2;

target/m68k/op_helper.c static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp, · line 262

Quoted 8 lines
target/m68k/op_helper.c +1 -1
@@ -256,7 +256,7 @@ static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp,
                                    uint16_t format, uint16_t sr,
                                    uint32_t addr, uint32_t retaddr)
  {
-    if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) {
+    if (m68k_feature(env, M68K_FEATURE_EXCEPTION_FORMAT_VEC)) {
          /*  all except 68000 */
          CPUState *cs = env_cpu(env);
          switch (format) {

LGTM,

Laurent, if you're currently too busy with other stuff, I could also add this to my next pull request?

Thomas

#2 lore raw
Quoted 80 lines · Thomas Huth
Quoted 69 lines · Daniel Palmer

 From the 68010 a word with the frame format and exception vector are placed on the stack before the PC and SR.

M68K_FEATURE_QUAD_MULDIV is currently checked to workout if to do this or not for the configured CPU but that flag isn't set for 68010 so currently the exception stack when 68010 is configured is incorrect.

It seems like checking M68K_FEATURE_MOVEFROMSR_PRIV would do but adding a new flag that shows exactly what is going on here is maybe clearer.

Add a new flag for the behaviour, M68K_FEATURE_EXCEPTION_FORMAT_VEC, and set it for 68010 and above, and then use it to control if the format and vector word are pushed/pop during exception entry/exit.

---
  target/m68k/cpu.c       | 4 +++-
  target/m68k/cpu.h       | 2 ++
  target/m68k/op_helper.c | 4 ++--

  3 files changed, 7 insertions(+), 3 deletions(-)
target/m68k/cpu.c +3 -1
index 1421e77c2c07..20718944b4c8 100644
@@ -137,7 +137,8 @@ static void m68000_cpu_initfn(Object *obj)
   }
   /*
- * Adds BKPT, MOVE-from-SR *now priv instr, and MOVEC, MOVES, RTD
+ * Adds BKPT, MOVE-from-SR *now priv instr, and MOVEC, MOVES, RTD,
+ *      format+vector in exception frame.
    */
   static void m68010_cpu_initfn(Object *obj)
   {
@@ -150,6 +151,7 @@ static void m68010_cpu_initfn(Object *obj)
       m68k_set_feature(env, M68K_FEATURE_BKPT);
       m68k_set_feature(env, M68K_FEATURE_MOVEC);
       m68k_set_feature(env, M68K_FEATURE_MOVEFROMSR_PRIV);
+    m68k_set_feature(env, M68K_FEATURE_EXCEPTION_FORMAT_VEC);
   }
   /*
target/m68k/cpu.h +2 -0
index d13427b0fe61..0fc591e618f6 100644
@@ -549,6 +549,8 @@ enum m68k_features {
       M68K_FEATURE_TRAPCC,
       /* MOVE from SR privileged (from 68010) */
       M68K_FEATURE_MOVEFROMSR_PRIV,
+    /* Exception frame with format+vector (from 68010) */
+    M68K_FEATURE_EXCEPTION_FORMAT_VEC,
   };
   static inline bool m68k_feature(CPUM68KState *env, int feature)
target/m68k/op_helper.c +1 -1
index 1ce850bbc594..b09771672dec 100644
@@ -52,7 +52,7 @@ throwaway:
       sp += 2;
       env->pc = cpu_ldl_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
       sp += 4;
-    if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) {
+    if (m68k_feature(env, M68K_FEATURE_EXCEPTION_FORMAT_VEC)) {
           /*  all except 68000 */
           fmt = cpu_lduw_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
           sp += 2;

target/m68k/op_helper.c static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp, · line 262

Quoted 8 lines
target/m68k/op_helper.c +1 -1
@@ -256,7 +256,7 @@ static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp,
                                     uint16_t format, uint16_t sr,
                                     uint32_t addr, uint32_t retaddr)
   {
-    if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) {
+    if (m68k_feature(env, M68K_FEATURE_EXCEPTION_FORMAT_VEC)) {
           /*  all except 68000 */
           CPUState *cs = env_cpu(env);
           switch (format) {

LGTM,

Quoted 1 line

This is also:
Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2164

Quoted 3 lines

Laurent, if you're currently too busy with other stuff, I could also add this to my next pull request?

 Thomas

ATB,

Mark.

#4 lore raw
Quoted 7 lines · Peter Maydell
Quoted 2 lines · Mark Cave-Ayland

This is also:
Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2164

"Resolves:" for gitlab bug URLs; "Fixes:" is for git commits.

I think GitLab will happily accept either form (see https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) which appears to be supported by the git history? But I can certainly make a note of this convention for the future.

ATB,

Mark.

#5 lore raw
Quoted 9 lines · Mark Cave-Ayland
Quoted 6 lines · Peter Maydell
Quoted 2 lines · Mark Cave-Ayland

This is also:
Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2164

Quoted 6 lines
Quoted 1 line

"Resolves:" for gitlab bug URLs; "Fixes:" is for git commits.

I think GitLab will happily accept either form (see
https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
which appears to be supported by the git history? But I can certainly make a note of this convention for the future.

Yes, gitlab's regex for detecting this is quite wide; the intention is to try to keep the semantic uses "note which git commit this change is correcting" and "note the bug which this change is resolving" distinct.

-- PMM

Reviewed-by on v1 1/1
#6 lore raw
In reply to Daniel Palmer

Le 15/01/2024 à 11:16, Daniel Palmer a écrit :

Quoted 72 lines

From the 68010 a word with the frame format and exception vector
are placed on the stack before the PC and SR.

M68K_FEATURE_QUAD_MULDIV is currently checked to workout if to do this or not for the configured CPU but that flag isn't set for 68010 so currently the exception stack when 68010 is configured is incorrect.

It seems like checking M68K_FEATURE_MOVEFROMSR_PRIV would do but adding a new flag that shows exactly what is going on here is maybe clearer.

Add a new flag for the behaviour, M68K_FEATURE_EXCEPTION_FORMAT_VEC, and set it for 68010 and above, and then use it to control if the format and vector word are pushed/pop during exception entry/exit.

---
  target/m68k/cpu.c       | 4 +++-
  target/m68k/cpu.h       | 2 ++
  target/m68k/op_helper.c | 4 ++--
  3 files changed, 7 insertions(+), 3 deletions(-)
target/m68k/cpu.c +3 -1
index 1421e77c2c07..20718944b4c8 100644
@@ -137,7 +137,8 @@ static void m68000_cpu_initfn(Object *obj)
  }
 
  /*
- * Adds BKPT, MOVE-from-SR *now priv instr, and MOVEC, MOVES, RTD
+ * Adds BKPT, MOVE-from-SR *now priv instr, and MOVEC, MOVES, RTD,
+ *      format+vector in exception frame.
   */
  static void m68010_cpu_initfn(Object *obj)
  {
@@ -150,6 +151,7 @@ static void m68010_cpu_initfn(Object *obj)
      m68k_set_feature(env, M68K_FEATURE_BKPT);
      m68k_set_feature(env, M68K_FEATURE_MOVEC);
      m68k_set_feature(env, M68K_FEATURE_MOVEFROMSR_PRIV);
+    m68k_set_feature(env, M68K_FEATURE_EXCEPTION_FORMAT_VEC);
  }
 
  /*
target/m68k/cpu.h +2 -0
index d13427b0fe61..0fc591e618f6 100644
@@ -549,6 +549,8 @@ enum m68k_features {
      M68K_FEATURE_TRAPCC,
      /* MOVE from SR privileged (from 68010) */
      M68K_FEATURE_MOVEFROMSR_PRIV,
+    /* Exception frame with format+vector (from 68010) */
+    M68K_FEATURE_EXCEPTION_FORMAT_VEC,
  };
 
  static inline bool m68k_feature(CPUM68KState *env, int feature)
target/m68k/op_helper.c +1 -1
index 1ce850bbc594..b09771672dec 100644
@@ -52,7 +52,7 @@ throwaway:
      sp += 2;
      env->pc = cpu_ldl_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
      sp += 4;
-    if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) {
+    if (m68k_feature(env, M68K_FEATURE_EXCEPTION_FORMAT_VEC)) {
          /*  all except 68000 */
          fmt = cpu_lduw_mmuidx_ra(env, sp, MMU_KERNEL_IDX, 0);
          sp += 2;

target/m68k/op_helper.c static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp, · line 262

Quoted 8 lines
target/m68k/op_helper.c +1 -1
@@ -256,7 +256,7 @@ static inline void do_stack_frame(CPUM68KState *env, uint32_t *sp,
                                    uint16_t format, uint16_t sr,
                                    uint32_t addr, uint32_t retaddr)
  {
-    if (m68k_feature(env, M68K_FEATURE_QUAD_MULDIV)) {
+    if (m68k_feature(env, M68K_FEATURE_EXCEPTION_FORMAT_VEC)) {
          /*  all except 68000 */
          CPUState *cs = env_cpu(env);
          switch (format) {