mirror of
https://github.com/mre/mos6502.git
synced 2024-12-22 12:29:31 +00:00
Fix build.
This commit is contained in:
parent
404f8ba1e8
commit
82e2cac30c
@ -39,5 +39,5 @@ name = "emu6502"
|
||||
name = "emu6502"
|
||||
|
||||
[dependencies]
|
||||
log = "0.2.1"
|
||||
log = "0.2.3"
|
||||
|
||||
|
@ -31,10 +31,10 @@ use std::ops::Add;
|
||||
// The idea here is that it doesn't make sense to add two addresses, but it
|
||||
// does make sense to add an address and an "address-difference". (If this
|
||||
// is too annoying to work with we should let it go.)
|
||||
#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Show)]
|
||||
#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
|
||||
pub struct AddressDiff(pub i32);
|
||||
|
||||
#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Show)]
|
||||
#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
|
||||
pub struct Address(pub u16);
|
||||
|
||||
impl Add<AddressDiff> for Address {
|
||||
|
@ -46,7 +46,7 @@ use machine::Machine;
|
||||
// PC | program counter
|
||||
//
|
||||
|
||||
#[derive(Copy, Show, PartialEq, Eq)]
|
||||
#[derive(Copy, Debug, PartialEq, Eq)]
|
||||
pub enum Instruction
|
||||
// i/o vars should be listed as follows:
|
||||
// NV BDIZC A X Y S PC M
|
||||
|
@ -55,7 +55,7 @@ impl StatusArgs {
|
||||
}
|
||||
|
||||
pub bitflags! {
|
||||
#[derive(Show)]
|
||||
#[derive(Debug)]
|
||||
flags Status: u8 {
|
||||
const PS_NEGATIVE = 0b10000000,
|
||||
const PS_OVERFLOW = 0b01000000,
|
||||
@ -121,7 +121,7 @@ impl Status {
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Show)]
|
||||
#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
|
||||
pub struct StackPointer(pub u8);
|
||||
|
||||
impl StackPointer {
|
||||
@ -144,7 +144,7 @@ impl StackPointer {
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Copy, PartialEq, Eq, Show)]
|
||||
#[derive(Copy, PartialEq, Eq, Debug)]
|
||||
pub struct Registers {
|
||||
pub accumulator: i8,
|
||||
pub index_x: i8,
|
||||
|
Loading…
Reference in New Issue
Block a user