6502/mre-mos6502
1
0
Fork 0
mirror of https://github.com/mre/mos6502.git synced 2025-02-26 18:29:14 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade to Rust 2018 edition

Browse Source
This commit is contained in:
Matthias Endler 2021-04-07 13:55:41 +02:00
parent b6e4a5ce8b
commit 24973d7fbd
6 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -34,6 +34,7 @@ version = "0.2.0"
authors = ["The 6502-rs Developers"] authors = ["The 6502-rs Developers"]
build = "build.rs" build = "build.rs"
exclude = ["examples/**"] exclude = ["examples/**"]
edition = "2018"
[lib] [lib]
# This will look in src/lib.rs # This will look in src/lib.rs

2
README.md
View File

@ -17,7 +17,6 @@ use mos6502::address::Address;
use mos6502::cpu; use mos6502::cpu;
fn main() { fn main() {
let zero_page_data = [56, 49]; let zero_page_data = [56, 49];
let program = [ let program = [
@ -51,6 +50,5 @@ fn main() {
cpu.run(); cpu.run();
assert_eq!(7, cpu.registers.accumulator); assert_eq!(7, cpu.registers.accumulator);
} }
``` ```

9
src/cpu.rs
View File

@ -25,11 +25,10 @@
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE. // POSSIBILITY OF SUCH DAMAGE.
use address::{Address, AddressDiff}; use crate::address::{Address, AddressDiff};
use instruction; use crate::instruction::{self, DecodedInstr, Instruction, OpInput};
use instruction::{DecodedInstr, Instruction, OpInput}; use crate::memory::Memory;
use memory::Memory; use crate::registers::{Registers, StackPointer, Status, StatusArgs};
use registers::{Registers, StackPointer, Status, StatusArgs};
#[derive(Clone)] #[derive(Clone)]
pub struct CPU { pub struct CPU {

6
src/instruction.rs
View File

@ -25,9 +25,9 @@
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE. // POSSIBILITY OF SUCH DAMAGE.
use address::Address; use crate::address::Address;
use address::AddressDiff; use crate::address::AddressDiff;
use cpu::CPU; use crate::cpu::CPU;
// Abbreviations // Abbreviations
// //

2
src/memory.rs
View File

@ -25,7 +25,7 @@
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE. // POSSIBILITY OF SUCH DAMAGE.
use address::{Address, AddressDiff}; use crate::address::{Address, AddressDiff};
// JAM: We can probably come up with a better way to represent address ranges. // JAM: We can probably come up with a better way to represent address ranges.
// Address range type? // Address range type?

4
src/registers.rs
View File

@ -25,8 +25,8 @@
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE. // POSSIBILITY OF SUCH DAMAGE.
use address::{Address, AddressDiff}; use crate::address::{Address, AddressDiff};
use memory::{STACK_ADDRESS_HI, STACK_ADDRESS_LO}; use crate::memory::{STACK_ADDRESS_HI, STACK_ADDRESS_LO};
// Useful for constructing Status instances // Useful for constructing Status instances
#[derive(Copy, Clone)] #[derive(Copy, Clone)]