diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-04-01 15:08:21 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-04-01 15:08:21 +0000 |
| commit | fcc72045e8f2494a78fc6afc3e51aaa9b5221f75 (patch) | |
| tree | fc2d8d21b3d4b677aff30ad76e898f5f4361d7fb | |
| parent | 65fe7b09a5e4018580ebbbcd9db790f1f2136428 (diff) | |
Fix Sparc co-processor ops (Aurelien Jarno)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2567 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | target-sparc/cpu.h | 1 | ||||
| -rw-r--r-- | target-sparc/translate.c | 27 |
2 files changed, 27 insertions, 1 deletions
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 499d5cd96d..91b4a26087 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -40,6 +40,7 @@ #define TT_TOVF 0x0a #define TT_EXTINT 0x10 #define TT_DIV_ZERO 0x2a +#define TT_NCP_INSN 0x24 #define TT_TRAP 0x80 #else #define TT_TFAULT 0x08 diff --git a/target-sparc/translate.c b/target-sparc/translate.c index 0d768ce6b0..65d08147eb 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -1746,7 +1746,7 @@ static void disas_sparc_insn(DisasContext * dc) gen_op_sra(); gen_movl_T0_reg(rd); #endif - } else if (xop < 0x38) { + } else if (xop < 0x36) { rs1 = GET_FIELD(insn, 13, 17); gen_movl_reg_T0(rs1); if (IS_IMM) { /* immediate */ @@ -2162,6 +2162,14 @@ static void disas_sparc_insn(DisasContext * dc) goto illegal_insn; } } + } else if (xop == 0x36 || xop == 0x37) { /* CPop1 & CPop2, + V9 impdep1 & + impdep2 */ +#ifdef TARGET_SPARC64 + goto illegal_insn; +#else + goto ncp_insn; +#endif #ifdef TARGET_SPARC64 } else if (xop == 0x39) { /* V9 return */ rs1 = GET_FIELD(insn, 13, 17); @@ -2410,6 +2418,15 @@ static void disas_sparc_insn(DisasContext * dc) break; #ifndef TARGET_SPARC64 + case 0x30: /* ldc */ + case 0x31: /* ldcsr */ + case 0x33: /* lddc */ + case 0x34: /* stc */ + case 0x35: /* stcsr */ + case 0x36: /* stdcq */ + case 0x37: /* stdc */ + goto ncp_insn; + break; /* avoid warnings */ (void) &gen_op_stfa; (void) &gen_op_stdfa; @@ -2618,6 +2635,14 @@ static void disas_sparc_insn(DisasContext * dc) save_state(dc); gen_op_fpexception_im(FSR_FTT_UNIMPFPOP); dc->is_br = 1; + return; +#ifndef TARGET_SPARC64 + ncp_insn: + save_state(dc); + gen_op_exception(TT_NCP_INSN); + dc->is_br = 1; + return; +#endif } static inline int gen_intermediate_code_internal(TranslationBlock * tb, |