6502/mre-mos6502
1
0
Fork 0
mirror of https://github.com/mre/mos6502.git synced 2024-11-22 13:32:25 +00:00
Code Issues Projects Releases Wiki Activity

Fix build.

Browse Source
This commit is contained in:
Andrew Keeton 2015-02-12 17:13:13 -05:00
parent 404f8ba1e8
commit 82e2cac30c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -39,5 +39,5 @@ name = "emu6502"
name = "emu6502" name = "emu6502"
[dependencies] [dependencies]
log = "0.2.1" log = "0.2.3"

4
src/address.rs
View File

@ -31,10 +31,10 @@ use std::ops::Add;
// The idea here is that it doesn't make sense to add two addresses, but it // 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 // does make sense to add an address and an "address-difference". (If this
// is too annoying to work with we should let it go.) // 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); pub struct AddressDiff(pub i32);
#[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Show)] #[derive(Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
pub struct Address(pub u16); pub struct Address(pub u16);
impl Add<AddressDiff> for Address { impl Add<AddressDiff> for Address {

2
src/instruction.rs
View File

@ -46,7 +46,7 @@ use machine::Machine;
// PC | program counter // PC | program counter
// //
#[derive(Copy, Show, PartialEq, Eq)] #[derive(Copy, Debug, PartialEq, Eq)]
pub enum Instruction pub enum Instruction
// i/o vars should be listed as follows: // i/o vars should be listed as follows:
// NV BDIZC A X Y S PC M // NV BDIZC A X Y S PC M

6
src/registers.rs
View File

@ -55,7 +55,7 @@ impl StatusArgs {
} }
pub bitflags! { pub bitflags! {
#[derive(Show)] #[derive(Debug)]
flags Status: u8 { flags Status: u8 {
const PS_NEGATIVE = 0b10000000, const PS_NEGATIVE = 0b10000000,
const PS_OVERFLOW = 0b01000000, 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); pub struct StackPointer(pub u8);
impl StackPointer { impl StackPointer {
@ -144,7 +144,7 @@ impl StackPointer {
} }
} }
#[derive(Copy, PartialEq, Eq, Show)] #[derive(Copy, PartialEq, Eq, Debug)]
pub struct Registers { pub struct Registers {
pub accumulator: i8, pub accumulator: i8,
pub index_x: i8, pub index_x: i8,