purged .unwrap()
This commit is contained in:
@@ -254,7 +254,7 @@ impl Executable for Instruction {
|
||||
// To populate the lower 16 bits, see LLI.
|
||||
Self::LoadUpperImmediate(a) => {
|
||||
*cpu.reg(a.r1) =
|
||||
(cpu.get(a.r1) & 0x0000_FFFF) | u32::from(a.immediate) << 16;
|
||||
(cpu.get(a.r1) & 0x0000_FFFF) | (u32::from(a.immediate) << 16);
|
||||
}
|
||||
|
||||
// Unconditionally jumps to the calculated address or direct address
|
||||
|
||||
@@ -128,7 +128,7 @@ impl Component for MemoryInspector {
|
||||
// combine all 4 bytes in the chunk into a u32
|
||||
let combined = chunk
|
||||
.iter()
|
||||
.fold(0u32, |acc, &byte| acc << 8 | u32::from(byte));
|
||||
.fold(0u32, |acc, &byte| (acc << 8) | u32::from(byte));
|
||||
|
||||
ui.monospace(format!("{combined}"));
|
||||
ui.monospace(format!("{}", Instruction::decode(combined).unwrap_or(Instruction::Nop)));
|
||||
|
||||
Reference in New Issue
Block a user