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

chore: update to latest builtin syntax

Browse Source
This commit is contained in:
Rekai Nyangadzayi Musuka
2023-07-10 21:20:07 -05:00
parent 954fb279ad
commit d96c9c01ff
25 changed files with 679 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/apu/Noise.zig
View File

@@ -76,14 +76,14 @@ pub fn sound4CntL(self: *const Self) u16 {
/// NR41, NR42
pub fn setSound4CntL(self: *Self, value: u16) void {
self.setNr41(@truncate(u8, value));
self.setNr42(@truncate(u8, value >> 8));
self.setNr41(@as(u8, @truncate(value)));
self.setNr42(@as(u8, @truncate(value >> 8)));
}
/// NR41
pub fn setNr41(self: *Self, len: u8) void {
self.len = @truncate(u6, len);
self.len_dev.timer = @as(u7, 64) - @truncate(u6, len);
self.len = @as(u6, @truncate(len));
self.len_dev.timer = @as(u7, 64) - @as(u6, @truncate(len));
}
/// NR42
@@ -99,8 +99,8 @@ pub fn sound4CntH(self: *const Self) u16 {
/// NR43, NR44
pub fn setSound4CntH(self: *Self, fs: *const FrameSequencer, value: u16) void {
self.poly.raw = @truncate(u8, value);
self.setNr44(fs, @truncate(u8, value >> 8));
self.poly.raw = @as(u8, @truncate(value));
self.setNr44(fs, @as(u8, @truncate(value >> 8)));
}
/// NR44

10
src/core/apu/Tone.zig
View File

@@ -77,14 +77,14 @@ pub fn sound2CntL(self: *const Self) u16 {
/// NR21, NR22
pub fn setSound2CntL(self: *Self, value: u16) void {
self.setNr21(@truncate(u8, value));
self.setNr22(@truncate(u8, value >> 8));
self.setNr21(@as(u8, @truncate(value)));
self.setNr22(@as(u8, @truncate(value >> 8)));
}
/// NR21
pub fn setNr21(self: *Self, value: u8) void {
self.duty.raw = value;
self.len_dev.timer = @as(u7, 64) - @truncate(u6, value);
self.len_dev.timer = @as(u7, 64) - @as(u6, @truncate(value));
}
/// NR22
@@ -100,8 +100,8 @@ pub fn sound2CntH(self: *const Self) u16 {
/// NR23, NR24
pub fn setSound2CntH(self: *Self, fs: *const FrameSequencer, value: u16) void {
self.setNr23(@truncate(u8, value));
self.setNr24(fs, @truncate(u8, value >> 8));
self.setNr23(@as(u8, @truncate(value)));
self.setNr24(fs, @as(u8, @truncate(value >> 8)));
}
/// NR23

14
src/core/apu/ToneSweep.zig
View File

@@ -81,8 +81,8 @@ pub fn onToneSweepEvent(self: *Self, late: u64) void {
/// NR10, NR11, NR12
pub fn setSound1Cnt(self: *Self, value: u32) void {
self.setSound1CntL(@truncate(u8, value));
self.setSound1CntH(@truncate(u16, value >> 16));
self.setSound1CntL(@as(u8, @truncate(value)));
self.setSound1CntH(@as(u16, @truncate(value >> 16)));
}
/// NR10
@@ -111,14 +111,14 @@ pub fn sound1CntH(self: *const Self) u16 {
/// NR11, NR12
pub fn setSound1CntH(self: *Self, value: u16) void {
self.setNr11(@truncate(u8, value));
self.setNr12(@truncate(u8, value >> 8));
self.setNr11(@as(u8, @truncate(value)));
self.setNr12(@as(u8, @truncate(value >> 8)));
}
/// NR11
pub fn setNr11(self: *Self, value: u8) void {
self.duty.raw = value;
self.len_dev.timer = @as(u7, 64) - @truncate(u6, value);
self.len_dev.timer = @as(u7, 64) - @as(u6, @truncate(value));
}
/// NR12
@@ -134,8 +134,8 @@ pub fn sound1CntX(self: *const Self) u16 {
/// NR13, NR14
pub fn setSound1CntX(self: *Self, fs: *const FrameSequencer, value: u16) void {
self.setNr13(@truncate(u8, value));
self.setNr14(fs, @truncate(u8, value >> 8));
self.setNr13(@as(u8, @truncate(value)));
self.setNr14(fs, @as(u8, @truncate(value >> 8)));
}
/// NR13

12
src/core/apu/Wave.zig
View File

@@ -64,8 +64,8 @@ pub fn tick(self: *Self, comptime kind: Tick) void {
/// NR30, NR31, NR32
pub fn setSound3Cnt(self: *Self, value: u32) void {
self.setSound3CntL(@truncate(u8, value));
self.setSound3CntH(@truncate(u16, value >> 16));
self.setSound3CntL(@as(u8, @truncate(value)));
self.setSound3CntH(@as(u16, @truncate(value >> 16)));
}
/// NR30
@@ -86,8 +86,8 @@ pub fn sound3CntH(self: *const Self) u16 {
/// NR31, NR32
pub fn setSound3CntH(self: *Self, value: u16) void {
self.setNr31(@truncate(u8, value));
self.vol.raw = (@truncate(u8, value >> 8));
self.setNr31(@as(u8, @truncate(value)));
self.vol.raw = (@as(u8, @truncate(value >> 8)));
}
/// NR31
@@ -98,8 +98,8 @@ pub fn setNr31(self: *Self, len: u8) void {
/// NR33, NR34
pub fn setSound3CntX(self: *Self, fs: *const FrameSequencer, value: u16) void {
self.setNr33(@truncate(u8, value));
self.setNr34(fs, @truncate(u8, value >> 8));
self.setNr33(@as(u8, @truncate(value)));
self.setNr34(fs, @as(u8, @truncate(value >> 8)));
}
/// NR33, NR34

4
src/core/apu/device/Sweep.zig
View File

@@ -28,8 +28,8 @@ pub fn tick(self: *Self, ch1: *ToneSweep) void {
const new_freq = self.calculate(ch1.sweep, &ch1.enabled);
if (new_freq <= 0x7FF and ch1.sweep.shift.read() != 0) {
ch1.freq.frequency.write(@truncate(u11, new_freq));
self.shadow = @truncate(u11, new_freq);
ch1.freq.frequency.write(@as(u11, @truncate(new_freq)));
self.shadow = @as(u11, @truncate(new_freq));
_ = self.calculate(ch1.sweep, &ch1.enabled);
}

2
src/core/apu/signal/Wave.zig
View File

@@ -70,7 +70,7 @@ pub fn sample(self: *const Self, nr30: io.WaveSelect) u4 {
const base = if (nr30.bank.read()) @as(u32, 0x10) else 0;
const value = self.buf[base + self.offset / 2];
return if (self.offset & 1 == 0) @truncate(u4, value >> 4) else @truncate(u4, value);
return if (self.offset & 1 == 0) @as(u4, @truncate(value >> 4)) else @as(u4, @truncate(value));
}
/// TODO: Write comment