paoda
/
zba
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: rename ARM and THUMB SWI functions

This commit is contained in:
Rekai Nyangadzayi Musuka 2022-02-04 04:20:14 -04:00
parent 1b8db0c427
commit b233981a34
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpu.zig
View File

@ -16,7 +16,7 @@ const halfAndSignedDataTransfer = @import("cpu/arm/half_signed_data_transfer.zig
const blockDataTransfer = @import("cpu/arm/block_data_transfer.zig").blockDataTransfer; const blockDataTransfer = @import("cpu/arm/block_data_transfer.zig").blockDataTransfer;
const branch = @import("cpu/arm/branch.zig").branch; const branch = @import("cpu/arm/branch.zig").branch;
const branchAndExchange = @import("cpu/arm/branch.zig").branchAndExchange; const branchAndExchange = @import("cpu/arm/branch.zig").branchAndExchange;
const softwareInterrupt = @import("cpu/arm/software_interrupt.zig").softwareInterrupt; const armSoftwareInterrupt = @import("cpu/arm/software_interrupt.zig").armSoftwareInterrupt;
const singleDataSwap = @import("cpu/arm/single_data_swap.zig").singleDataSwap; const singleDataSwap = @import("cpu/arm/single_data_swap.zig").singleDataSwap;
const multiply = @import("cpu/arm/multiply.zig").multiply; const multiply = @import("cpu/arm/multiply.zig").multiply;
@ -44,7 +44,7 @@ const format16 = @import("cpu/thumb/branch.zig").format16;
const format18 = @import("cpu/thumb/branch.zig").format18; const format18 = @import("cpu/thumb/branch.zig").format18;
const format19 = @import("cpu/thumb/branch.zig").format19; const format19 = @import("cpu/thumb/branch.zig").format19;
const format17 = @import("cpu/thumb/software_interrupt.zig").format17; const thumbSoftwareInterrupt = @import("cpu/thumb/software_interrupt.zig").thumbSoftwareInterrupt;
pub const ArmInstrFn = fn (*Arm7tdmi, *Bus, u32) void; pub const ArmInstrFn = fn (*Arm7tdmi, *Bus, u32) void;
pub const ThumbInstrFn = fn (*Arm7tdmi, *Bus, u16) void; pub const ThumbInstrFn = fn (*Arm7tdmi, *Bus, u16) void;
@ -485,7 +485,7 @@ fn thumbPopulate() [0x400]ThumbInstrFn {
lut[i] = format13(S); lut[i] = format13(S);
} else if (i >> 2 & 0xFF == 0xDF) { } else if (i >> 2 & 0xFF == 0xDF) {
lut[i] = format17(); lut[i] = thumbSoftwareInterrupt();
} else if (i >> 6 & 0xF == 0b1000) { } else if (i >> 6 & 0xF == 0b1000) {
const L = i >> 5 & 1 == 1; const L = i >> 5 & 1 == 1;
const offset = i & 0x1F; const offset = i & 0x1F;
@ -619,7 +619,7 @@ fn armPopulate() [0x1000]ArmInstrFn {
lut[i] = armUndefined; lut[i] = armUndefined;
} else if (i >> 8 & 0xF == 0b1111) { } else if (i >> 8 & 0xF == 0b1111) {
// Bits 27:24 // Bits 27:24
lut[i] = softwareInterrupt(); lut[i] = armSoftwareInterrupt();
} }
} }

2
src/cpu/arm/software_interrupt.zig
View File

@ -4,7 +4,7 @@ const Bus = @import("../../Bus.zig");
const Arm7tdmi = @import("../../cpu.zig").Arm7tdmi; const Arm7tdmi = @import("../../cpu.zig").Arm7tdmi;
const InstrFn = @import("../../cpu.zig").ArmInstrFn; const InstrFn = @import("../../cpu.zig").ArmInstrFn;
pub fn softwareInterrupt() InstrFn { pub fn armSoftwareInterrupt() InstrFn {
return struct { return struct {
fn inner(cpu: *Arm7tdmi, _: *Bus, _: u32) void { fn inner(cpu: *Arm7tdmi, _: *Bus, _: u32) void {
// Copy Values from Current Mode // Copy Values from Current Mode

2
src/cpu/thumb/software_interrupt.zig
View File

@ -2,7 +2,7 @@ const Bus = @import("../../Bus.zig");
const Arm7tdmi = @import("../../cpu.zig").Arm7tdmi; const Arm7tdmi = @import("../../cpu.zig").Arm7tdmi;
const InstrFn = @import("../../cpu.zig").ThumbInstrFn; const InstrFn = @import("../../cpu.zig").ThumbInstrFn;
pub fn format17() InstrFn { pub fn thumbSoftwareInterrupt() InstrFn {
return struct { return struct {
fn inner(cpu: *Arm7tdmi, _: *Bus, _: u16) void { fn inner(cpu: *Arm7tdmi, _: *Bus, _: u16) void {
// Copy Values from Current Mode // Copy Values from Current Mode