X86: Fix the microcode for sign/zero extending moves that use high byte registers.

4 files changed, 19 insertions, 18 deletions

diff --git a/tests/long/10.mcf/ref/x86/linux/simple-atomic/config.ini b/tests/long/10.mcf/ref/x86/linux/simple-atomic/config.ini
index e2db98cec..7f2a4c792 100644
--- a/tests/long/10.mcf/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/10.mcf/ref/x86/linux/simple-atomic/config.ini
@@ -23,6 +23,7 @@ max_insts_all_threads=0
 max_insts_any_thread=0
 max_loads_all_threads=0
 max_loads_any_thread=0
+numThreads=1
 phase=0
 progress_interval=0
 simulate_data_stalls=false
@@ -77,7 +78,7 @@ port=system.physmem.port[0] system.cpu.icache_port system.cpu.dcache_port
 [system.physmem]
 type=PhysicalMemory
 file=
-latency=1
+latency=30000
 latency_var=0
 null=false
 range=0:268435455
diff --git a/tests/long/10.mcf/ref/x86/linux/simple-atomic/m5stats.txt b/tests/long/10.mcf/ref/x86/linux/simple-atomic/m5stats.txt
index e2d716404..0b2ce70f9 100644
--- a/tests/long/10.mcf/ref/x86/linux/simple-atomic/m5stats.txt
+++ b/tests/long/10.mcf/ref/x86/linux/simple-atomic/m5stats.txt
@@ -1,17 +1,17 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                2310204                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 340492                       # Number of bytes of host memory used
-host_seconds                                   116.72                       # Real time elapsed on the host
-host_tick_rate                             1419682765                       # Simulator tick rate (ticks/s)
+host_inst_rate                                1382425                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 329284                       # Number of bytes of host memory used
+host_seconds                                   195.09                       # Real time elapsed on the host
+host_tick_rate                              849513127                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-sim_insts                                   269654744                       # Number of instructions simulated
-sim_seconds                                  0.165710                       # Number of seconds simulated
-sim_ticks                                165710415000                       # Number of ticks simulated
+sim_insts                                   269697420                       # Number of instructions simulated
+sim_seconds                                  0.165732                       # Number of seconds simulated
+sim_ticks                                165731753000                       # Number of ticks simulated
 system.cpu.idle_fraction                            0                       # Percentage of idle cycles
 system.cpu.not_idle_fraction                        1                       # Percentage of non-idle cycles
-system.cpu.numCycles                        331420831                       # number of cpu cycles simulated
-system.cpu.num_insts                        269654744                       # Number of instructions executed
+system.cpu.numCycles                        331463507                       # number of cpu cycles simulated
+system.cpu.num_insts                        269697420                       # Number of instructions executed
 system.cpu.num_refs                         124054658                       # Number of memory references
 system.cpu.workload.PROG:num_syscalls             444                       # Number of system calls
 
diff --git a/tests/long/10.mcf/ref/x86/linux/simple-atomic/stderr b/tests/long/10.mcf/ref/x86/linux/simple-atomic/stderr
index d81394784..88df04dd8 100644..100755
--- a/tests/long/10.mcf/ref/x86/linux/simple-atomic/stderr
+++ b/tests/long/10.mcf/ref/x86/linux/simple-atomic/stderr
@@ -1,4 +1,4 @@
-0: system.remote_gdb.listener: listening for remote gdb on port 7002
+warn: Sockets disabled, not accepting gdb connections
 warn: Entering event queue @ 0.  Starting simulation...
 warn: instruction 'fnstcw_Mw' unimplemented
 warn: instruction 'fldcw_Mw' unimplemented
diff --git a/tests/long/10.mcf/ref/x86/linux/simple-atomic/stdout b/tests/long/10.mcf/ref/x86/linux/simple-atomic/stdout
index ac908f417..2116bb4ba 100644..100755
--- a/tests/long/10.mcf/ref/x86/linux/simple-atomic/stdout
+++ b/tests/long/10.mcf/ref/x86/linux/simple-atomic/stdout
@@ -5,12 +5,12 @@ The Regents of The University of Michigan
 All Rights Reserved
 
 
-M5 compiled Jul 23 2008 16:08:41
-M5 started Wed Jul 23 16:09:15 2008
-M5 executing on blue
-M5 revision 5515:47bf96eec2c6221cf91de8a078897c1b5e46cfbf
-M5 commit date Wed Jul 23 15:35:08 2008 -0700
-command line: build/X86_SE/m5.fast -d build/X86_SE/tests/fast/long/10.mcf/x86/linux/simple-atomic tests/run.py long/10.mcf/x86/linux/simple-atomic
+M5 compiled Aug 31 2008 22:55:36
+M5 revision 5540:e8dde121a24fbf62092085d7d996cb8c965c3fe6
+M5 commit date Sun Aug 31 22:51:39 2008 -0400
+M5 started Aug 31 2008 22:56:01
+M5 executing on zizzer
+command line: build/X86_SE/m5.fast -d build/X86_SE/tests/fast/long/10.mcf/x86/linux/simple-atomic -re --stdout-file stdout --stderr-file stderr tests/run.py long/10.mcf/x86/linux/simple-atomic
 Global frequency set at 1000000000000 ticks per second
 
 MCF SPEC version 1.6.I
@@ -28,4 +28,4 @@ simplex iterations         : 2663
 flow value                 : 3080014995
 checksum                   : 68389
 optimal
-Exiting @ tick 165710415000 because target called exit()
+Exiting @ tick 165731753000 because target called exit()