2005-05-26 David Ung <davidu@mips.com>
authorChris Demetriou <cgd@google.com>
Thu, 26 May 2005 21:31:57 +0000 (21:31 +0000)
committerChris Demetriou <cgd@google.com>
Thu, 26 May 2005 21:31:57 +0000 (21:31 +0000)
        * mips.igen (mips32r2, mips64r2): New ISA models.  Add new model
        tags to all instructions which are applicable to the new ISAs.
        (do_ror, do_dror, ROR, RORV, DROR, DROR32, DRORV): Add, moved from
        vr.igen.
        * mips3264r2.igen: New file for MIPS 32/64 revision 2 specific
        instructions.
        * vr.igen (do_ror, do_dror, ROR, RORV, DROR, DROR32, DRORV): Move
        to mips.igen.
        * configure.ac (mipsisa32r2*-*-*, mipsisa64r2*-*-*): Add new targets.
        * configure: Regenerate.

sim/mips/ChangeLog
sim/mips/configure
sim/mips/configure.ac
sim/mips/mips.igen
sim/mips/mips3264r2.igen [new file with mode: 0644]
sim/mips/vr.igen

index b4ee0929ef5aeba1c81a8f8b054e022dc049d17b..00a76d21e92dc94e5c5858ecb2c3ef771e09658f 100644 (file)
@@ -1,3 +1,16 @@
+2005-05-26  David Ung  <davidu@mips.com>
+       * mips.igen (mips32r2, mips64r2): New ISA models.  Add new model
+       tags to all instructions which are applicable to the new ISAs.
+       (do_ror, do_dror, ROR, RORV, DROR, DROR32, DRORV): Add, moved from
+       vr.igen.
+       * mips3264r2.igen: New file for MIPS 32/64 revision 2 specific
+       instructions. 
+       * vr.igen (do_ror, do_dror, ROR, RORV, DROR, DROR32, DRORV): Move
+       to mips.igen.
+       * configure.ac (mipsisa32r2*-*-*, mipsisa64r2*-*-*): Add new targets.
+       * configure: Regenerate.
 2005-03-23  Mark Kettenis  <kettenis@gnu.org>
 
        * configure: Regenerate.
index 58d0b5c4fd47dc563b1e44c9a6a8aa9864f0c5af..d74ccc3267c28cd43b739bdac9fffef685e73c76 100755 (executable)
@@ -7821,11 +7821,21 @@ case "${target}" in
                        sim_igen_filter="32,64,f"
                        sim_m16_filter="16"
                        ;;
+  mipsisa32r2*-*-*)    sim_gen=IGEN
+                       sim_igen_machine="-M mips32r2"
+                       sim_igen_filter="32,f"
+                       sim_mach_default="mipsisa32r2"
+                       ;;
   mipsisa32*-*-*)      sim_gen=IGEN
                        sim_igen_machine="-M mips32"
                        sim_igen_filter="32,f"
                        sim_mach_default="mipsisa32"
                        ;;
+  mipsisa64r2*-*-*)    sim_gen=IGEN
+                       sim_igen_machine="-M mips64r2,mips3d"
+                       sim_igen_filter="32,64,f"
+                       sim_mach_default="mipsisa64r2"
+                       ;;
   mipsisa64sb1*-*-*)   sim_gen=IGEN
                        sim_igen_machine="-M mips64,mips3d,sb1"
                        sim_igen_filter="32,64,f"
index 1f183b708e2c01b3ce43ba93d09198ab89fbface..8b191afcf3f7d6817e5eaac799495ea7a0bdcd69 100644 (file)
@@ -145,11 +145,21 @@ case "${target}" in
                        sim_igen_filter="32,64,f"
                        sim_m16_filter="16"
                        ;;
+  mipsisa32r2*-*-*)    sim_gen=IGEN
+                       sim_igen_machine="-M mips32r2"
+                       sim_igen_filter="32,f"
+                       sim_mach_default="mipsisa32r2"
+                       ;;
   mipsisa32*-*-*)      sim_gen=IGEN
                        sim_igen_machine="-M mips32"
                        sim_igen_filter="32,f"
                        sim_mach_default="mipsisa32"
                        ;;
+  mipsisa64r2*-*-*)    sim_gen=IGEN
+                       sim_igen_machine="-M mips64r2,mips3d"
+                       sim_igen_filter="32,64,f"
+                       sim_mach_default="mipsisa64r2"
+                       ;;
   mipsisa64sb1*-*-*)   sim_gen=IGEN
                        sim_igen_machine="-M mips64,mips3d,sb1"
                        sim_igen_filter="32,64,f"
index b6a40857f58b1fe15c4bac50d79e7c0caf15f3a3..40e3802154327d09b78141827b7a2ede5370b823 100644 (file)
@@ -45,7 +45,9 @@
 :model:::mipsIV:mips8000:
 :model:::mipsV:mipsisaV:
 :model:::mips32:mipsisa32:
+:model:::mips32r2:mipsisa32r2:
 :model:::mips64:mipsisa64:
+:model:::mips64r2:mipsisa64r2:
 
 //  Vendor ISAs:
 //
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *vr4100:
 *vr5000:
 *r3900:
 
 :function:::address_word:loadstore_ea:address_word base, address_word offset
 *mips64:
+*mips64r2:
 {
 #if 0 /* XXX FIXME: enable this only after some additional testing.  */
   /* If in user mode and UX is not set, use 32-bit compatibility effective
 
 :function:::int:not_word_value:unsigned_word value
 *mips32:
+*mips32r2:
 {
   /* On MIPS32, since registers are 32-bits, there's no check to be done.  */
   return 0;
 
 :function:::int:not_word_value:unsigned_word value
 *mips64:
+*mips64r2:
 {
   return ((value >> 32) != (value & 0x80000000 ? 0xFFFFFFFF : 0));
 }
 
 :function:::void:unpredictable:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 {
   unpredictable_action (CPU, CIA);
 }
 
 :function:::int:check_mt_hilo:hilo_history *history
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *r3900:
 {
   signed64 time = sim_events_time (SD);
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 
 :function:::int:check_mult_hilo:hilo_history *hi, hilo_history *lo
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *r3900:
 {
   /* FIXME: could record the fact that a stall occured if we want */
 
 :function:::int:check_div_hilo:hilo_history *hi, hilo_history *lo
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 {
   signed64 time = sim_events_time (SD);
   hi->op.timestamp = time;
 *mipsV:
 *vr4100:
 *vr5000:
+*vr5400:
+*vr5500:
 {
   // The check should be similar to mips64 for any with PX/UX bit equivalents.
 }
 
 :function:::void:check_u64:instruction_word insn
 *mips64:
+*mips64r2:
 {
 #if 0 /* XXX FIXME: enable this only after some additional testing.  */
   if (UserMode && (SR & (status_UX|status_PX)) == 0)
 //
 // MIPS Architecture:
 //
-//        CPU Instruction Set (mipsI - mipsV, mips32, mips64)
+//        CPU Instruction Set (mipsI - mipsV, mips32/r2, mips64/r2)
 //
 
 
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 011100,5.RS,5.RT,5.RD,00000,100001:SPECIAL2:32::CLO
 "clo r<RD>, r<RS>"
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr5500:
 {
   unsigned32 temp = GPR[RS];
 011100,5.RS,5.RT,5.RD,00000,100000:SPECIAL2:32::CLZ
 "clz r<RD>, r<RS>"
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr5500:
 {
   unsigned32 temp = GPR[RS];
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 011100,5.RS,5.RT,5.RD,00000,100101:SPECIAL2:64::DCLO
 "dclo r<RD>, r<RS>"
 *mips64:
+*mips64r2:
 *vr5500:
 {
   unsigned64 temp = GPR[RS];
 011100,5.RS,5.RT,5.RD,00000,100100:SPECIAL2:64::DCLZ
 "dclz r<RD>, r<RS>"
 *mips64:
+*mips64r2:
 *vr5500:
 {
   unsigned64 temp = GPR[RS];
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
   do_ddivu (SD_, RS, RT);
 }
 
-
-
 :function:::void:do_div:int rs, int rt
 {
   check_div_hilo (SD_, HIHISTORY, LOHISTORY);
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 }
 
 
-
 :function:::void:do_dmultx:int rs, int rt, int rd, int signed_p
 {
   unsigned64 lo;
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 {
   check_u64 (SD_, instruction_0);
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 {
   check_u64 (SD_, instruction_0);
   do_dmultu (SD_, RS, RT, RD);
 }
 
+
+:function:::unsigned64:do_dror:unsigned64 x,unsigned64 y
+{
+  unsigned64 result;
+
+  y &= 63;
+  TRACE_ALU_INPUT2 (x, y);
+  result = ROTR64 (x, y);
+  TRACE_ALU_RESULT (result);
+  return result;
+}
+
+000000,00001,5.RT,5.RD,5.SHIFT,111010::64::DROR
+"dror r<RD>, r<RT>, <SHIFT>"
+*mips64r2:
+*vr5400:
+*vr5500:
+{
+  check_u64 (SD_, instruction_0);
+  GPR[RD] = do_dror (SD_, GPR[RT], SHIFT);
+}
+
+000000,00001,5.RT,5.RD,5.SHIFT,111110::64::DROR32
+"dror32 r<RD>, r<RT>, <SHIFT>"
+*mips64r2:
+*vr5400:
+*vr5500:
+{
+  check_u64 (SD_, instruction_0);
+  GPR[RD] = do_dror (SD_, GPR[RT], SHIFT + 32);
+}
+
+000000,5.RS,5.RT,5.RD,00001,010110::64::DRORV
+"drorv r<RD>, r<RT>, r<RS>"
+*mips64r2:
+*vr5400:
+*vr5500:
+{
+  check_u64 (SD_, instruction_0);
+  GPR[RD] = do_dror (SD_, GPR[RT], GPR[RS]);
+}
+
+
 :function:::void:do_dsll:int rt, int rd, int shift
 {
   TRACE_ALU_INPUT2 (GPR[rt], shift);
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 011100,5.RS,5.RT,00000,00000,000000:SPECIAL2:32::MADD
 "madd r<RS>, r<RT>"
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr5500:
 {
   signed64 temp;
 011100,5.RS,5.RT,00000,00000,000001:SPECIAL2:32::MADDU
 "maddu r<RS>, r<RT>"
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr5500:
 {
   unsigned64 temp;
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   if (GPR[RT] != 0)
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   if (GPR[RT] == 0)
 011100,5.RS,5.RT,00000,00000,000100:SPECIAL2:32::MSUB
 "msub r<RS>, r<RT>"
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr5500:
 {
   signed64 temp;
 011100,5.RS,5.RT,00000,00000,000101:SPECIAL2:32::MSUBU
 "msubu r<RS>, r<RT>"
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr5500:
 {
   unsigned64 temp;
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 011100,5.RS,5.RT,5.RD,00000,000010:SPECIAL2:32::MUL
 "mul r<RD>, r<RS>, r<RT>"
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr5500:
 {
   signed64 prod;
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 {
   do_mult (SD_, RS, RT, 0);
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 {
   do_multu (SD_, RS, RT, 0);
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   address_word base = GPR[BASE];
 }
 
 
+:function:::unsigned64:do_ror:unsigned32 x,unsigned32 y
+{
+  unsigned64 result;
+
+  y &= 31;
+  TRACE_ALU_INPUT2 (x, y);
+  result = EXTEND32 (ROTR32 (x, y));
+  TRACE_ALU_RESULT (result);
+  return result;
+}
+
+000000,00001,5.RT,5.RD,5.SHIFT,000010::32::ROR
+"ror r<RD>, r<RT>, <SHIFT>"
+*mips32r2:
+*mips64r2:
+*vr5400:
+*vr5500:
+{
+  GPR[RD] = do_ror (SD_, GPR[RT], SHIFT);
+}
+
+000000,5.RS,5.RT,5.RD,00001,000110::32::RORV
+"rorv r<RD>, r<RT>, r<RS>"
+*mips32r2:
+*mips64r2:
+*vr5400:
+*vr5500:
+{
+  GPR[RD] = do_ror (SD_, GPR[RT], GPR[RS]);
+}
+
+
 :function:::void:do_store:unsigned access, address_word base, address_word offset, unsigned_word word
 {
   address_word mask = (WITH_TARGET_WORD_BITSIZE == 64 ? 0x7 : 0x3);
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 }
 
 
+
 101001,5.BASE,5.RT,16.OFFSET:NORMAL:32::SH
 "sh r<RT>, <OFFSET>(r<BASE>)"
 *mipsI:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 "ssnop":RD == 0 && RT == 0 && SHIFT == 1
 "sll r<RD>, r<RT>, <SHIFT>"
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 {
   /* Skip shift for NOP and SSNOP, so that there won't be lots of
      extraneous trace output.  */
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *r3900:
 *vr5000:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIII:
 *mipsIV:
 *mips32:
+*mips32r2:
 *vr4100:
 *vr5000:
 *r3900:
 :function:::void:check_fmt_p:int fmt, instruction_word insn
 *mipsV:
 *mips64:
+*mips64r2:
 {
   if ((fmt != fmt_single) && (fmt != fmt_double)
       && (fmt != fmt_ps || (UserMode && (SR & (status_UX|status_PX)) == 0)))
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 :function:::unsigned64:do_load_double:address_word base, address_word offset
 *mipsII:
 *mips32:
+*mips32r2:
 {
   int bigendian = (BigEndianCPU ? ! ReverseEndian : ReverseEndian);
   address_word vaddr;
 :function:::void:do_store_double:address_word base, address_word offset, unsigned64 v
 *mipsII:
 *mips32:
+*mips32r2:
 {
   int bigendian = (BigEndianCPU ? ! ReverseEndian : ReverseEndian);
   address_word vaddr;
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 "alnv.ps f<FD>, f<FS>, f<FT>, r<RS>"
 *mipsV:
 *mips64:
+*mips64r2:
 {
   unsigned64 fs;
   unsigned64 ft;
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 #*vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 "cfc1 r<RT>, f<FS>"
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 {
   check_fpu (SD_);
   if (FS == 0 || FS == 25 || FS == 26 || FS == 28 || FS == 31)
 "ctc1 r<RT>, f<FS>"
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 {
   check_fpu (SD_);
   TRACE_ALU_INPUT1 (GPR[RT]);
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 "cvt.ps.s f<FD>, f<FS>, f<FT>"
 *mipsV:
 *mips64:
+*mips64r2:
 {
   check_fpu (SD_);
   check_u64 (SD_, instruction_0);
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 "cvt.s.pl f<FD>, f<FS>"
 *mipsV:
 *mips64:
+*mips64r2:
 {
   check_fpu (SD_);
   check_u64 (SD_, instruction_0);
 "cvt.s.pu f<FD>, f<FS>"
 *mipsV:
 *mips64:
+*mips64r2:
 {
   check_fpu (SD_);
   check_u64 (SD_, instruction_0);
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 "ldc1 f<FT>, <OFFSET>(r<BASE>)"
 *mipsII:
 *mips32:
+*mips32r2:
 {
   check_fpu (SD_);
   COP_LD (1, FT, do_load_double (SD_, GPR[BASE], EXTEND16 (OFFSET)));
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   check_fpu (SD_);
 "luxc1 f<FD>, r<INDEX>(r<BASE>)"
 *mipsV:
 *mips64:
+*mips64r2:
 {
   address_word base = GPR[BASE];
   address_word index = GPR[INDEX];
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   check_fpu (SD_);
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   int fmt = FMT;
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   check_fpu (SD_);
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   int fmt = FMT;
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   check_fpu (SD_);
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   check_fpu (SD_);
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   int fmt = FMT;
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   int fmt = FMT;
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   int fmt = FMT;
 "pll.ps f<FD>, f<FS>, f<FT>"
 *mipsV:
 *mips64:
+*mips64r2:
 {
   check_fpu (SD_);
   check_u64 (SD_, instruction_0);
 "plu.ps f<FD>, f<FS>, f<FT>"
 *mipsV:
 *mips64:
+*mips64r2:
 {
   check_fpu (SD_);
   check_u64 (SD_, instruction_0);
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   address_word base = GPR[BASE];
 "pul.ps f<FD>, f<FS>, f<FT>"
 *mipsV:
 *mips64:
+*mips64r2:
 {
   check_fpu (SD_);
   check_u64 (SD_, instruction_0);
 "puu.ps f<FD>, f<FS>, f<FT>"
 *mipsV:
 *mips64:
+*mips64r2:
 {
   check_fpu (SD_);
   check_u64 (SD_, instruction_0);
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   int fmt = FMT;
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   int fmt = FMT;
 "sdc1 f<FT>, <OFFSET>(r<BASE>)"
 *mipsII:
 *mips32:
+*mips32r2:
 {
   check_fpu (SD_);
   do_store_double (SD_, GPR[BASE], EXTEND16 (OFFSET), COP_SD (1, FT));
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr5000:
 {
   check_fpu (SD_);
 "suxc1 f<FS>, r<INDEX>(r<BASE>)"
 *mipsV:
 *mips64:
+*mips64r2:
 {
   unsigned64 v;
   address_word base = GPR[BASE];
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr5000:
 {
 
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 
 
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 {
   check_u64 (SD_, instruction_0);
   DecodeCoproc (instruction_0);
 *mipsIV:
 *mipsV:
 *mips64:
+*mips64r2:
 {
   check_u64 (SD_, instruction_0);
   DecodeCoproc (instruction_0);
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 *r3900:
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *r3900:
 {
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 
 *mipsIV:
 *mipsV:
 *mips32:
+*mips32r2:
 *mips64:
+*mips64r2:
 *vr4100:
 *vr5000:
 
-\f
+
+:include:::mips3264r2.igen
 :include:::m16.igen
 :include:::mdmx.igen
 :include:::mips3d.igen
 :include:::sb1.igen
 :include:::tx.igen
 :include:::vr.igen
-\f
+
diff --git a/sim/mips/mips3264r2.igen b/sim/mips/mips3264r2.igen
new file mode 100644 (file)
index 0000000..e0d1326
--- /dev/null
@@ -0,0 +1,260 @@
+// -*- C -*-
+
+// Simulator definition for the MIPS 32/64 revision 2 instructions.
+// Copyright (C) 2004 Free Software Foundation, Inc.
+// Contributed by David Ung, of MIPS Technologies.
+//
+// This file is part of GDB, the GNU debugger.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2, or (at your option)
+// any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+011111,5.RS,5.RT,5.SIZE,5.LSB,000011::64::DEXT
+"dext r<RT>, r<RS>, <LSB>, <SIZE+1>"
+*mips64r2:
+{
+  check_u64 (SD_, instruction_0);
+  TRACE_ALU_INPUT3 (GPR[RS], LSB, SIZE);
+  GPR[RT] = EXTRACTED64 (GPR[RS], LSB + SIZE, LSB);
+  TRACE_ALU_RESULT1 (GPR[RT]);
+}
+
+011111,5.RS,5.RT,5.SIZE,5.LSB,000001::64::DEXTM
+"dextm r<RT>, r<RS>, <LSB>, <SIZE+33>"
+*mips64r2:
+{
+  check_u64 (SD_, instruction_0);
+  TRACE_ALU_INPUT3 (GPR[RS], LSB, SIZE);
+  GPR[RT] = EXTRACTED64 (GPR[RS], LSB + SIZE + 32, LSB);
+  TRACE_ALU_RESULT1 (GPR[RT]);
+}
+
+011111,5.RS,5.RT,5.SIZE,5.LSB,000010::64::DEXTU
+"dextu r<RT>, r<RS>, <LSB+32>, <SIZE+1>"
+*mips64r2:
+{
+  check_u64 (SD_, instruction_0);
+  TRACE_ALU_INPUT3 (GPR[RS], LSB, SIZE);
+  GPR[RT] = EXTRACTED64 (GPR[RS], LSB + 32 + SIZE, LSB + 32);
+  TRACE_ALU_RESULT1 (GPR[RT]);
+}
+
+
+010000,01011,5.RT,01100,00000,0,00,000::32::DI
+"di":RT == 0
+"di r<RT>"
+*mips32r2:
+*mips64r2:
+{
+  TRACE_ALU_INPUT0 ();
+  GPR[RT] = EXTEND32 (SR);
+  SR &= ~status_IE;
+  TRACE_ALU_RESULT1 (GPR[RT]);
+}
+
+
+011111,5.RS,5.RT,5.MSB,5.LSB,000111::64::DINS
+"dins r<RT>, r<RS>, <LSB>, <MSB-LSB+1>"
+*mips64r2:
+{
+  check_u64 (SD_, instruction_0);
+  TRACE_ALU_INPUT4 (GPR[RT], GPR[RS], LSB, MSB);
+  if (LSB <= MSB)
+    GPR[RT] ^= (GPR[RT] ^ (GPR[RS] << LSB)) & MASK64 (MSB, LSB);
+  TRACE_ALU_RESULT1 (GPR[RT]);
+}
+
+011111,5.RS,5.RT,5.MSB,5.LSB,000101::64::DINSM
+"dinsm r<RT>, r<RS>, <LSB>, <MSB+32-LSB+1>"
+*mips64r2:
+{
+  check_u64 (SD_, instruction_0);
+  TRACE_ALU_INPUT4 (GPR[RT], GPR[RS], LSB, MSB);
+  if (LSB <= MSB + 32)
+    GPR[RT] ^= (GPR[RT] ^ (GPR[RS] << LSB)) & MASK64 (MSB + 32, LSB);
+  TRACE_ALU_RESULT1 (GPR[RT]);
+}
+
+011111,5.RS,5.RT,5.MSB,5.LSB,000110::64::DINSU
+"dinsu r<RT>, r<RS>, <LSB+32>, <MSB-LSB+1>"
+*mips64r2:
+{
+  check_u64 (SD_, instruction_0);
+  TRACE_ALU_INPUT4 (GPR[RT], GPR[RS], LSB, MSB);
+  if (LSB <= MSB)
+    GPR[RT] ^= (GPR[RT] ^ (GPR[RS] << (LSB + 32)))
+      & MASK64 (MSB + 32, LSB + 32);
+  TRACE_ALU_RESULT1 (GPR[RT]);
+}
+
+
+011111,00000,5.RT,5.RD,00010,100100::64::DSBH
+"dsbh r<RD>, r<RT>"
+*mips64r2:
+{
+  union { unsigned64 d; unsigned16 h[4]; } u;
+  check_u64 (SD_, instruction_0);
+  TRACE_ALU_INPUT1 (GPR[RT]);
+  u.d = GPR[RT];
+  u.h[0] = SWAP_2 (u.h[0]);
+  u.h[1] = SWAP_2 (u.h[1]);
+  u.h[2] = SWAP_2 (u.h[2]);
+  u.h[3] = SWAP_2 (u.h[3]);
+  GPR[RD] = u.d;
+  TRACE_ALU_RESULT1 (GPR[RD]);
+}
+
+011111,00000,5.RT,5.RD,00101,100100::64::DSHD
+"dshd r<RD>, r<RT>"
+*mips64r2:
+{
+  unsigned64 d;
+  check_u64 (SD_, instruction_0);
+  TRACE_ALU_INPUT1 (GPR[RT]);
+  d = GPR[RT];
+  GPR[RD] = ((d >> 48)
+            | (d << 48)
+            | ((d & 0x0000ffff00000000) >> 16)
+            | ((d & 0x00000000ffff0000) << 16));
+  TRACE_ALU_RESULT1 (GPR[RD]);
+}
+
+
+010000,01011,5.RT,01100,00000,1,00,000::32::EI
+"ei":RT == 0
+"ei r<RT>"
+*mips32r2:
+*mips64r2:
+{
+  TRACE_ALU_INPUT0 ();
+  GPR[RT] = EXTEND32 (SR);
+  SR |= status_IE;
+  TRACE_ALU_RESULT1 (GPR[RT]);
+}
+
+
+011111,5.RS,5.RT,5.SIZE,5.LSB,000000::32::EXT
+"ext r<RT>, r<RS>, <LSB>, <SIZE+1>"
+*mips32r2:
+*mips64r2:
+{
+  TRACE_ALU_INPUT3 (GPR[RS], LSB, SIZE);
+  GPR[RT] = EXTEND32 (EXTRACTED32 (GPR[RS], LSB + SIZE, LSB));
+  TRACE_ALU_RESULT1 (GPR[RT]);
+}
+
+
+010001,00011,5.RT,5.FS,00000000000:COP1Sa:32,f::MFHC1
+"mfhc1 r<RT>, f<FS>"
+*mips32r2:
+*mips64r2:
+{
+  check_fpu (SD_);
+  if (SizeFGR() == 64)
+    GPR[RT] = EXTEND32 (WORD64HI (FGR[FS]));
+  else if ((FS & 0x1) == 0)
+    GPR[RT] = EXTEND32 (FGR[FS + 1]);
+  else
+    {
+      if (STATE_VERBOSE_P(SD))
+       sim_io_eprintf (SD, 
+                "Warning: PC 0x%lx: MFHC1 32-bit use of odd FPR number\n",
+                       (long) CIA);
+      GPR[RT] = EXTEND32 (0xBADF00D);
+    }
+  TRACE_ALU_RESULT (GPR[RT]);
+}
+
+010001,00111,5.RT,5.FS,00000000000:COP1Sa:32,f::MTHC1
+"mthc1 r<RT>, f<FS>"
+*mips32r2:
+*mips64r2:
+{
+  check_fpu (SD_); 
+  if (SizeFGR() == 64)
+    StoreFPR (FS, fmt_uninterpreted_64, SET64HI (GPR[RT]) | VL4_8 (FGR[FS]));
+  else if ((FS & 0x1) == 0)
+    StoreFPR (FS + 1, fmt_uninterpreted_32, VL4_8 (GPR[RT]));
+  else
+    {
+      if (STATE_VERBOSE_P(SD))
+       sim_io_eprintf (SD, 
+                "Warning: PC 0x%lx: MTHC1 32-bit use of odd FPR number\n",
+                       (long) CIA);
+      StoreFPR (FS, fmt_uninterpreted_32, 0xDEADC0DE);
+    }
+  TRACE_FP_RESULT (GPR[RT]);
+}
+
+
+011111,5.RS,5.RT,5.MSB,5.LSB,000100::32::INS
+"ins r<RT>, r<RS>, <LSB>, <MSB-LSB+1>"
+*mips32r2:
+*mips64r2:
+{
+  TRACE_ALU_INPUT4 (GPR[RT], GPR[RS], LSB, MSB);
+  if (LSB <= MSB)
+    GPR[RT] = EXTEND32 (GPR[RT] ^
+                       ((GPR[RT] ^ (GPR[RS] << LSB)) & MASK32 (MSB, LSB)));
+  TRACE_ALU_RESULT1 (GPR[RT]);
+}
+
+
+011111,00000,5.RT,5.RD,10000,100000::32::SEB
+"seb r<RD>, r<RT>"
+*mips32r2:
+*mips64r2:
+{
+  TRACE_ALU_INPUT1 (GPR[RT]);
+  GPR[RD] = EXTEND8 (GPR[RT]);
+  TRACE_ALU_RESULT1 (GPR[RD]);
+}
+
+011111,00000,5.RT,5.RD,11000,100000::32::SEH
+"seh r<RD>, r<RT>"
+*mips32r2:
+*mips64r2:
+{
+  TRACE_ALU_INPUT1 (GPR[RT]);
+  GPR[RD] = EXTEND16 (GPR[RT]);
+  TRACE_ALU_RESULT1 (GPR[RD]);
+}
+
+
+000001,5.BASE,11111,16.OFFSET::32::SYNCI
+"synci <OFFSET>(r<BASE>)"
+*mips32r2:
+*mips64r2:
+{
+  // sync i-cache - nothing to do currently
+}
+
+
+011111,00000,5.RT,5.RD,00010,100000::32::WSBH
+"wsbh r<RD>, r<RT>"
+*mips32r2:
+*mips64r2:
+{
+  union { unsigned32 w; unsigned16 h[2]; } u;
+  TRACE_ALU_INPUT1 (GPR[RT]);
+  u.w = GPR[RT];
+  u.h[0] = SWAP_2 (u.h[0]);
+  u.h[1] = SWAP_2 (u.h[1]);
+  GPR[RD] = EXTEND32 (u.w);
+  TRACE_ALU_RESULT1 (GPR[RD]);
+}
+
+
+
index 742a85d0ca8021b2e9d9b3581e8982eb67b0e3d2..9266ae6dc613865427e17cfa2060242fb26fed62 100644 (file)
     GPR[rd] = store_hi_p ? HI : LO;
 }
 
-// 32-bit rotate right of X by Y bits.
-:function:::unsigned64:do_ror:unsigned32 x,unsigned32 y
-*vr5400:
-*vr5500:
-{
-  unsigned64 result;
-
-  y &= 31;
-  TRACE_ALU_INPUT2 (x, y);
-  result = EXTEND32 (ROTR32 (x, y));
-  TRACE_ALU_RESULT (result);
-  return result;
-}
-
-// Likewise 64-bit
-:function:::unsigned64:do_dror:unsigned64 x,unsigned64 y
-*vr5400:
-*vr5500:
-{
-  unsigned64 result;
-
-  y &= 63;
-  TRACE_ALU_INPUT2 (x, y);
-  result = ROTR64 (x, y);
-  TRACE_ALU_RESULT (result);
-  return result;
-}
-
-
 // VR4100 instructions.
 
 000000,5.RS,5.RT,00000,00000,101000::32::MADD16
                0 /* single */);
 }
 
-000000,00001,5.RT,5.RD,5.SHIFT,000010::32::ROR
-"ror r<RD>, r<RT>, <SHIFT>"
-*vr5400:
-*vr5500:
-{
-  GPR[RD] = do_ror (SD_, GPR[RT], SHIFT);
-}
-
-000000,5.RS,5.RT,5.RD,00001,000110::32::RORV
-"rorv r<RD>, r<RT>, r<RS>"
-*vr5400:
-*vr5500:
-{
-  GPR[RD] = do_ror (SD_, GPR[RT], GPR[RS]);
-}
-
-000000,00001,5.RT,5.RD,5.SHIFT,111010::64::DROR
-"dror r<RD>, r<RT>, <SHIFT>"
-*vr5400:
-*vr5500:
-{
-  GPR[RD] = do_dror (SD_, GPR[RT], SHIFT);
-}
-
-000000,00001,5.RT,5.RD,5.SHIFT,111110::64::DROR32
-"dror32 r<RD>, r<RT>, <SHIFT>"
-*vr5400:
-*vr5500:
-{
-  GPR[RD] = do_dror (SD_, GPR[RT], SHIFT + 32);
-}
-
-000000,5.RS,5.RT,5.RD,00001,010110::64::DRORV
-"drorv r<RD>, r<RT>, r<RS>"
-*vr5400:
-*vr5500:
-{
-  GPR[RD] = do_dror (SD_, GPR[RT], GPR[RS]);
-}
 
 010011,5.BASE,5.INDEX,5.0,5.FD,000101:COP1X:64::LUXC1
 "luxc1 f<FD>, r<INDEX>(r<BASE>)"