mirror of
https://github.com/transistorfet/moa.git
synced 2024-05-29 04:41:29 +00:00
Fixed some warnings
This commit is contained in:
parent
2c2b8e58b4
commit
8060f7179b
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -2,6 +2,7 @@ Cargo.lock
|
||||||
.*.sw?
|
.*.sw?
|
||||||
/target
|
/target
|
||||||
*.vim
|
*.vim
|
||||||
|
junk/
|
||||||
|
|
||||||
perf.data
|
perf.data
|
||||||
perf.data.old
|
perf.data.old
|
||||||
|
|
|
@ -505,7 +505,7 @@ fn convert_indirect(lineno: usize, args: &[AssemblyOperand], disallow: Disallow)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn convert_reg_and_other<'a>(lineno: usize, args: &'a [AssemblyOperand], disallow: Disallow) -> Result<(u16, u16, &'a AssemblyOperand), Error> {
|
fn convert_reg_and_other<'a>(lineno: usize, args: &'a [AssemblyOperand], _disallow: Disallow) -> Result<(u16, u16, &'a AssemblyOperand), Error> {
|
||||||
match &args {
|
match &args {
|
||||||
&[AssemblyOperand::Register(reg), effective_address] => {
|
&[AssemblyOperand::Register(reg), effective_address] => {
|
||||||
Ok(((0b1 << 8), expect_reg_num(lineno, ®)?, effective_address))
|
Ok(((0b1 << 8), expect_reg_num(lineno, ®)?, effective_address))
|
||||||
|
@ -600,6 +600,7 @@ fn encode_size_for_move(size: Size) -> u16 {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
fn encode_size_bit(size: Size) -> Result<u16, Error> {
|
fn encode_size_bit(size: Size) -> Result<u16, Error> {
|
||||||
match size {
|
match size {
|
||||||
Size::Word => Ok(0b01 << 6),
|
Size::Word => Ok(0b01 << 6),
|
||||||
|
|
|
@ -825,14 +825,14 @@ impl M68k {
|
||||||
for i in 0..8 {
|
for i in 0..8 {
|
||||||
if (mask & 0x01) != 0 {
|
if (mask & 0x01) != 0 {
|
||||||
self.state.d_reg[i] = sign_extend_to_long(self.get_address_sized(addr as Address, size)?, size) as u32;
|
self.state.d_reg[i] = sign_extend_to_long(self.get_address_sized(addr as Address, size)?, size) as u32;
|
||||||
addr += size.in_bytes();
|
(addr, _) = overflowing_add_sized(addr, size.in_bytes(), Size::Long);
|
||||||
}
|
}
|
||||||
mask >>= 1;
|
mask >>= 1;
|
||||||
}
|
}
|
||||||
for i in 0..8 {
|
for i in 0..8 {
|
||||||
if (mask & 0x01) != 0 {
|
if (mask & 0x01) != 0 {
|
||||||
*self.get_a_reg_mut(i) = sign_extend_to_long(self.get_address_sized(addr as Address, size)?, size) as u32;
|
*self.get_a_reg_mut(i) = sign_extend_to_long(self.get_address_sized(addr as Address, size)?, size) as u32;
|
||||||
addr += size.in_bytes();
|
(addr, _) = overflowing_add_sized(addr, size.in_bytes(), Size::Long);
|
||||||
}
|
}
|
||||||
mask >>= 1;
|
mask >>= 1;
|
||||||
}
|
}
|
||||||
|
@ -1058,7 +1058,7 @@ impl M68k {
|
||||||
fn get_x_reg_value(&self, xreg: XRegister) -> u32 {
|
fn get_x_reg_value(&self, xreg: XRegister) -> u32 {
|
||||||
match xreg {
|
match xreg {
|
||||||
XRegister::DReg(reg) => self.state.d_reg[reg as usize],
|
XRegister::DReg(reg) => self.state.d_reg[reg as usize],
|
||||||
XRegister::AReg(reg) => self.state.a_reg[reg as usize],
|
XRegister::AReg(reg) => self.get_a_reg(reg),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1091,6 +1091,15 @@ impl M68k {
|
||||||
if self.is_supervisor() { &mut self.state.ssp } else { &mut self.state.usp }
|
if self.is_supervisor() { &mut self.state.ssp } else { &mut self.state.usp }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[inline(always)]
|
||||||
|
fn get_a_reg(&self, reg: Register) -> u32 {
|
||||||
|
if reg == 7 {
|
||||||
|
if self.is_supervisor() { self.state.ssp } else { self.state.usp }
|
||||||
|
} else {
|
||||||
|
self.state.a_reg[reg as usize]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[inline(always)]
|
#[inline(always)]
|
||||||
fn get_a_reg_mut(&mut self, reg: Register) -> &mut u32 {
|
fn get_a_reg_mut(&mut self, reg: Register) -> &mut u32 {
|
||||||
if reg == 7 {
|
if reg == 7 {
|
||||||
|
|
|
@ -162,6 +162,7 @@ mod decode_tests {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
#[test]
|
#[test]
|
||||||
pub fn run_assembler_opcode_tests() {
|
pub fn run_assembler_opcode_tests() {
|
||||||
let mut tests = 0;
|
let mut tests = 0;
|
||||||
|
@ -196,6 +197,7 @@ mod decode_tests {
|
||||||
panic!("{} errors out of {} tests", errors, tests);
|
panic!("{} errors out of {} tests", errors, tests);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
//use super::super::testcases::{TimingCase, TIMING_TESTS};
|
//use super::super::testcases::{TimingCase, TIMING_TESTS};
|
||||||
|
|
||||||
|
|
|
@ -198,7 +198,7 @@ impl Addressable for GenesisControllers {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Steppable for GenesisControllers {
|
impl Steppable for GenesisControllers {
|
||||||
fn step(&mut self, system: &System) -> Result<ClockElapsed, Error> {
|
fn step(&mut self, _system: &System) -> Result<ClockElapsed, Error> {
|
||||||
let duration = 100_000; // Update every 100us
|
let duration = 100_000; // Update every 100us
|
||||||
|
|
||||||
self.reset_timer += duration;
|
self.reset_timer += duration;
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
|
|
||||||
use std::iter::Iterator;
|
|
||||||
|
|
||||||
use crate::error::Error;
|
use crate::error::Error;
|
||||||
use crate::system::System;
|
use crate::system::System;
|
||||||
use crate::memory::dump_slice;
|
use crate::memory::dump_slice;
|
||||||
|
@ -191,7 +189,7 @@ impl Ym7101Memory {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn write_data_port(&mut self, addr: Address, data: &[u8]) -> Result<(), Error> {
|
pub fn write_data_port(&mut self, data: &[u8]) -> Result<(), Error> {
|
||||||
if (self.transfer_type & 0x30) == 0x20 {
|
if (self.transfer_type & 0x30) == 0x20 {
|
||||||
self.ctrl_port_buffer = None;
|
self.ctrl_port_buffer = None;
|
||||||
self.transfer_fill_word = if data.len() >= 2 { read_beu16(data) } else { data[0] as u16 };
|
self.transfer_fill_word = if data.len() >= 2 { read_beu16(data) } else { data[0] as u16 };
|
||||||
|
@ -211,7 +209,7 @@ impl Ym7101Memory {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn write_control_port(&mut self, addr: Address, data: &[u8]) -> Result<(), Error> {
|
pub fn write_control_port(&mut self, data: &[u8]) -> Result<(), Error> {
|
||||||
let value = read_beu16(data);
|
let value = read_beu16(data);
|
||||||
match (data.len(), self.ctrl_port_buffer) {
|
match (data.len(), self.ctrl_port_buffer) {
|
||||||
(2, None) => { self.ctrl_port_buffer = Some(value) },
|
(2, None) => { self.ctrl_port_buffer = Some(value) },
|
||||||
|
@ -814,7 +812,7 @@ impl Addressable for Ym7101 {
|
||||||
fn write(&mut self, addr: Address, data: &[u8]) -> Result<(), Error> {
|
fn write(&mut self, addr: Address, data: &[u8]) -> Result<(), Error> {
|
||||||
match addr {
|
match addr {
|
||||||
// Write to Data Port
|
// Write to Data Port
|
||||||
0x00 | 0x02 => self.state.memory.write_data_port(addr, data)?,
|
0x00 | 0x02 => self.state.memory.write_data_port(data)?,
|
||||||
|
|
||||||
// Write to Control Port
|
// Write to Control Port
|
||||||
0x04 | 0x06 => {
|
0x04 | 0x06 => {
|
||||||
|
@ -831,7 +829,7 @@ impl Addressable for Ym7101 {
|
||||||
self.set_register(value);
|
self.set_register(value);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
self.state.memory.write_control_port(addr, data)?;
|
self.state.memory.write_control_port(data)?;
|
||||||
self.state.status = (self.state.status & !STATUS_DMA_BUSY) | (if self.state.memory.transfer_dma_busy { STATUS_DMA_BUSY } else { 0 });
|
self.state.status = (self.state.status & !STATUS_DMA_BUSY) | (if self.state.memory.transfer_dma_busy { STATUS_DMA_BUSY } else { 0 });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -70,7 +70,7 @@ impl NoiseGenerator {
|
||||||
info!("set attenuation to {} {}", self.attenuation, self.on);
|
info!("set attenuation to {} {}", self.attenuation, self.on);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_control(&mut self, bits: u8) {
|
pub fn set_control(&mut self, _bits: u8) {
|
||||||
//let frequency = 3_579_545.0 / (count as f32 * 32.0);
|
//let frequency = 3_579_545.0 / (count as f32 * 32.0);
|
||||||
//self.wave.set_frequency(frequency);
|
//self.wave.set_frequency(frequency);
|
||||||
//debug!("set frequency to {}", frequency);
|
//debug!("set frequency to {}", frequency);
|
||||||
|
|
|
@ -48,7 +48,7 @@ impl Operator {
|
||||||
self.wave.reset();
|
self.wave.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_multiplier(&mut self, frequency: f32, multiplier: f32) {
|
pub fn set_multiplier(&mut self, _frequency: f32, multiplier: f32) {
|
||||||
self.multiplier = multiplier;
|
self.multiplier = multiplier;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user