fix mem_trace lines

brandonros · brandonros · commit 7665470a48b5 · 2024-12-22T13:21:42.000-05:00
diff --git a/src/emu.rs b/src/emu.rs
@@ -1524,7 +1524,7 @@ impl Emu {
                             name: name.clone(),
                         };
                         self.memory_operations.push(memory_operation);
-                        println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, operand, addr, v, name);
+                        println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, 64, addr, v, name);
                     }
                     return Some(v);
                 }
@@ -1547,7 +1547,7 @@ impl Emu {
                             name: name.clone(),
                         };
                         self.memory_operations.push(memory_operation);
-                        println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, operand, addr, v, name);
+                        println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, 32, addr, v, name);
                     }
                     return Some(v.into());
                 }
@@ -1570,7 +1570,7 @@ impl Emu {
                             name: name.clone(),
                         };
                         self.memory_operations.push(memory_operation);
-                        println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, operand, addr, v, name);
+                        println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, 16, addr, v, name);
                     }
                     return Some(v.into());
                 }
@@ -1593,7 +1593,7 @@ impl Emu {
                             name: name.clone(),
                         };
                         self.memory_operations.push(memory_operation);
-                        println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, operand, addr, v, name);
+                        println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, 8, addr, v, name);
                     }
                     return Some(v.into());
                 }

Original file line number	Diff line number	Diff line change
`@@ -1524,7 +1524,7 @@ impl Emu {`
`1524`	`1524`	`name: name.clone(),`
`1525`	`1525`	`};`
`1526`	`1526`	`self.memory_operations.push(memory_operation);`
`1527`		`- println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, operand, addr, v, name);`
	`1527`	`+ println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, 64, addr, v, name);`
`1528`	`1528`	`}`
`1529`	`1529`	`return Some(v);`
`1530`	`1530`	`}`
`@@ -1547,7 +1547,7 @@ impl Emu {`
`1547`	`1547`	`name: name.clone(),`
`1548`	`1548`	`};`
`1549`	`1549`	`self.memory_operations.push(memory_operation);`
`1550`		`- println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, operand, addr, v, name);`
	`1550`	`+ println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, 32, addr, v, name);`
`1551`	`1551`	`}`
`1552`	`1552`	`return Some(v.into());`
`1553`	`1553`	`}`
`@@ -1570,7 +1570,7 @@ impl Emu {`
`1570`	`1570`	`name: name.clone(),`
`1571`	`1571`	`};`
`1572`	`1572`	`self.memory_operations.push(memory_operation);`
`1573`		`- println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, operand, addr, v, name);`
	`1573`	`+ println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, 16, addr, v, name);`
`1574`	`1574`	`}`
`1575`	`1575`	`return Some(v.into());`
`1576`	`1576`	`}`
`@@ -1593,7 +1593,7 @@ impl Emu {`
`1593`	`1593`	`name: name.clone(),`
`1594`	`1594`	`};`
`1595`	`1595`	`self.memory_operations.push(memory_operation);`
`1596`		`- println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, operand, addr, v, name);`
	`1596`	`+ println!("\tmem_trace: pos = {} rip = {:x} op = read bits = {} address = 0x{:x} value = 0x{:x} name = '{}'", self.pos, self.regs.rip, 8, addr, v, name);`
`1597`	`1597`	`}`
`1598`	`1598`	`return Some(v.into());`
`1599`	`1599`	`}`