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/60.bzip2/ref/x86/linux/simple-atomic/config.ini b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/config.ini
index 3ebce331c..3a2c48ff2 100644
--- a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/config.ini
+++ b/tests/long/60.bzip2/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:134217727
diff --git a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/m5stats.txt b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/m5stats.txt
index 9b7f29b45..2e5af9606 100644
--- a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/m5stats.txt
+++ b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/m5stats.txt
@@ -1,17 +1,17 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                2222828                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 206012                       # Number of bytes of host memory used
-host_seconds                                  2067.49                       # Real time elapsed on the host
-host_tick_rate                             1357412596                       # Simulator tick rate (ticks/s)
+host_inst_rate                                2125831                       # Simulator instruction rate (inst/s)
+host_mem_usage                                 194800                       # Number of bytes of host memory used
+host_seconds                                  2188.89                       # Real time elapsed on the host
+host_tick_rate                             1295270570                       # Simulator tick rate (ticks/s)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-sim_insts                                  4595681265                       # Number of instructions simulated
-sim_seconds                                  2.806442                       # Number of seconds simulated
-sim_ticks                                2806441694500                       # Number of ticks simulated
+sim_insts                                  4653219908                       # Number of instructions simulated
+sim_seconds                                  2.835211                       # Number of seconds simulated
+sim_ticks                                2835211016000                       # 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                       5612883390                       # number of cpu cycles simulated
-system.cpu.num_insts                       4595681265                       # Number of instructions executed
+system.cpu.numCycles                       5670422033                       # number of cpu cycles simulated
+system.cpu.num_insts                       4653219908                       # Number of instructions executed
 system.cpu.num_refs                        1686313784                       # Number of memory references
 system.cpu.workload.PROG:num_syscalls              46                       # Number of system calls
 
diff --git a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stderr b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stderr
index 64c88a35a..4a54d0384 100644..100755
--- a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stderr
+++ b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stderr
@@ -1,4 +1,4 @@
-0: system.remote_gdb.listener: listening for remote gdb on port 7005
+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/60.bzip2/ref/x86/linux/simple-atomic/stdout b/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stdout
index 32d78ce58..df51001f3 100644..100755
--- a/tests/long/60.bzip2/ref/x86/linux/simple-atomic/stdout
+++ b/tests/long/60.bzip2/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:11:12 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/60.bzip2/x86/linux/simple-atomic tests/run.py long/60.bzip2/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/60.bzip2/x86/linux/simple-atomic -re --stdout-file stdout --stderr-file stderr tests/run.py long/60.bzip2/x86/linux/simple-atomic
 Global frequency set at 1000000000000 ticks per second
 spec_init
 Loading Input Data
@@ -26,4 +26,4 @@ Uncompressing Data
 Uncompressed data 1048576 bytes in length
 Uncompressed data compared correctly
 Tested 1MB buffer: OK!
-Exiting @ tick 2806441694500 because target called exit()
+Exiting @ tick 2835211016000 because target called exit()