feat(cpu): implement format 12 thumb instructions
This commit is contained in:
		@@ -19,6 +19,7 @@ const branchAndExchange = @import("cpu/arm/branch.zig").branchAndExchange;
 | 
			
		||||
// THUMB Instruction Groups
 | 
			
		||||
const format3 = @import("cpu/thumb/format3.zig").format3;
 | 
			
		||||
const format5 = @import("cpu/thumb/format5.zig").format5;
 | 
			
		||||
const format12 = @import("cpu/thumb/format12.zig").format12;
 | 
			
		||||
 | 
			
		||||
pub const ArmInstrFn = fn (*Arm7tdmi, *Bus, u32) void;
 | 
			
		||||
pub const ThumbInstrFn = fn (*Arm7tdmi, *Bus, u16) void;
 | 
			
		||||
@@ -169,6 +170,13 @@ fn thumbPopulate() [0x400]ThumbInstrFn {
 | 
			
		||||
 | 
			
		||||
                lut[i] = format5(op, h1, h2);
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            if (i >> 6 & 0xF == 0b1010) {
 | 
			
		||||
                const isSP = i >> 5 & 1 == 1;
 | 
			
		||||
                const rd = i >> 2 & 0x7;
 | 
			
		||||
 | 
			
		||||
                lut[i] = format12(isSP, rd);
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        return lut;
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										16
									
								
								src/cpu/thumb/format12.zig
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								src/cpu/thumb/format12.zig
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,16 @@
 | 
			
		||||
const std = @import("std");
 | 
			
		||||
 | 
			
		||||
const Bus = @import("../../Bus.zig");
 | 
			
		||||
const Arm7tdmi = @import("../../cpu.zig").Arm7tdmi;
 | 
			
		||||
const InstrFn = @import("../../cpu.zig").ThumbInstrFn;
 | 
			
		||||
 | 
			
		||||
pub fn format12(comptime isSP: bool, comptime rd: u3) InstrFn {
 | 
			
		||||
    return struct {
 | 
			
		||||
        fn inner(cpu: *Arm7tdmi, _: *Bus, opcode: u16) void {
 | 
			
		||||
            const left = if (isSP) cpu.r[13] else cpu.r[15] + 2 & 0xFFFF_FFFD; // fetch (+2)
 | 
			
		||||
            const right = @truncate(u10, opcode & 0xFF) << 2;
 | 
			
		||||
            const result = left + right; // TODO: What about overflows?
 | 
			
		||||
            cpu.r[rd] = result;
 | 
			
		||||
        }
 | 
			
		||||
    }.inner;
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user