From: Gabe Black <gblack@eecs.umich.edu>
Date: Tue, 23 Jan 2007 06:31:48 +0000 (-0800)
Subject: Merge zizzer.eecs.umich.edu:/bk/newmem
X-Git-Tag: m5_2.0_beta3~253
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1352e55ceb2d78a9a36451636b672cd6daf8550e;p=gem5.git

Merge zizzer.eecs.umich.edu:/bk/newmem
into  ewok.(none):/home/gblack/m5/newmemo3

src/sim/byteswap.hh:
    Hand Merge

--HG--
extra : convert_revision : 640d33ad0c416934e8a5107768e7f1dce6709ca8
---

1352e55ceb2d78a9a36451636b672cd6daf8550e
diff --cc src/arch/sparc/isa/decoder.isa
index 8abaf1007,175866eba..e59ce9d11
--- a/src/arch/sparc/isa/decoder.isa
+++ b/src/arch/sparc/isa/decoder.isa
@@@ -891,16 -893,15 +891,16 @@@ decode OP default Unknown::unknown(
                      if(Canrestore == 0)
                      {
                          if(Otherwin)
-                             fault = new FillNOther(Wstate<5:3>);
+                             fault = new FillNOther(4*Wstate<5:3>);
                          else
-                             fault = new FillNNormal(Wstate<2:0>);
+                             fault = new FillNNormal(4*Wstate<2:0>);
                      }
 +                    //Check for alignment faults
 +                    else if(target & 0x3)
 +                        fault = new MemAddressNotAligned;
                      else
                      {
 -                        //CWP should be set directly so that it always happens
 -                        //Also, this will allow writing to the new window and
 -                        //reading from the old one
 +                        NNPC = target;
                          Cwp = (Cwp - 1 + NWindows) % NWindows;
                          Cansave = Cansave + 1;
                          Canrestore = Canrestore - 1;
@@@ -941,9 -946,13 +941,9 @@@
                  if(Cansave == 0)
                  {
                      if(Otherwin)
-                         fault = new SpillNOther(Wstate<5:3>);
+                         fault = new SpillNOther(4*Wstate<5:3>);
                      else
-                         fault = new SpillNNormal(Wstate<2:0>);
+                         fault = new SpillNNormal(4*Wstate<2:0>);
 -                    //Cwp = (Cwp + 2) % NWindows;
                  }
                  else if(Cleanwin - Canrestore == 0)
                  {
diff --cc src/arch/sparc/isa/formats/mem/blockmem.isa
index 62ac4b43a,32421a75f..352e963b3
--- a/src/arch/sparc/isa/formats/mem/blockmem.isa
+++ b/src/arch/sparc/isa/formats/mem/blockmem.isa
@@@ -492,16 -494,16 +494,16 @@@ let {
                  flag_code = "flags[IsLastMicroOp] = true;"
                  pcedCode = matcher.sub("RdHigh", code)
              else:
-                 flag_code = "flags[IsDelayedCommit] = true;"
+                 flag_code = "flags[IsDelayedCommit] = true; flags[IsFirstMicroOp] = true;"
                  pcedCode = matcher.sub("RdLow", code)
 -            iop = InstObjParams(name, Name, 'TwinMem', pcedCode,
 -                    opt_flags, {"ea_code": addrCalcReg,
 +            iop = InstObjParams(name, Name, 'TwinMem',
 +                    {"code": pcedCode, "ea_code": addrCalcReg,
                      "fault_check": faultCode, "micro_pc": microPc,
 -                    "set_flags": flag_code})
 -            iop_imm = InstObjParams(name, Name + 'Imm', 'TwinMemImm', pcedCode,
 -                    opt_flags, {"ea_code": addrCalcImm,
 +                    "set_flags": flag_code}, opt_flags)
 +            iop_imm = InstObjParams(name, Name + 'Imm', 'TwinMemImm',
 +                    {"code": pcedCode, "ea_code": addrCalcImm,
                      "fault_check": faultCode, "micro_pc": microPc,
 -                    "set_flags": flag_code})
 +                    "set_flags": flag_code}, opt_flags)
              decoder_output += BlockMemMicroConstructor.subst(iop)
              decoder_output += BlockMemMicroConstructor.subst(iop_imm)
              exec_output += doDualSplitExecute(
diff --cc src/sim/byteswap.hh
index 7b63cf6e0,4ac1ee711..9e7390977
--- a/src/sim/byteswap.hh
+++ b/src/sim/byteswap.hh
@@@ -132,8 -130,7 +132,8 @@@ template <typename T> static inline T l
  
  //For conversions not involving the guest system, we can define the functions
  //conditionally based on the BYTE_ORDER macro and outside of the namespaces
- #if defined(_BIG_ENDIAN) || BYTE_ORDER == BIG_ENDIAN
+ #if defined(_BIG_ENDIAN) || !defined(_LITTLE_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
 +const ByteOrder HostByteOrder = BigEndianByteOrder;
  template <typename T> static inline T htole(T value) {return swap_byte(value);}
  template <typename T> static inline T letoh(T value) {return swap_byte(value);}
  template <typename T> static inline T htobe(T value) {return value;}