Skip to content

Commit

Permalink
rust 2018 and shorten package names
Browse files Browse the repository at this point in the history
martinlindhe committed Jan 6, 2020
1 parent bfd444d commit 6448451
Showing 14 changed files with 142 additions and 120 deletions.
180 changes: 116 additions & 64 deletions Cargo.lock

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -2,7 +2,9 @@ test:
cargo test --all -- --color always --nocapture

test-harness:
cargo run --release --package dustbox_harness
cargo run --release --package harness harness/sets/demo-com-16bit.yml
cargo run --release --package harness harness/sets/demo-com-32bit.yml
cargo run --release --package harness harness/sets/games-com-commercial-16bit.yml

expensive-encode:
RUST_TEST_THREADS=1 cargo test encode -- --color always --nocapture --ignored
@@ -14,19 +16,19 @@ mips:
cargo test --release mips -- --nocapture

run:
cargo run --package dustbox_debugger
cargo run --package debugger

run-release:
cargo run --release --package dustbox_debugger
cargo run --release --package debugger

disasm:
cargo run --release --package dustbox_disassembler
cargo run --release --package disassembler

install-disasm:
cargo install --path disassembler --force

fuzz:
cargo run --package dustbox_fuzzer -- --mutations 50 --host 172.16.72.129
cargo run --package fuzzer -- --mutations 50 --host 172.16.72.129

lint:
cargo clippy --all
3 changes: 2 additions & 1 deletion debugger/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[package]
name = "dustbox_debugger"
name = "debugger"
version = "0.1.0"
authors = ["Martin Lindhe"]
edition = "2018"

[lib]
path = "src/lib.rs"
5 changes: 1 addition & 4 deletions debugger/src/bin/debugger-main.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
extern crate dustbox_debugger;
extern crate dustbox;

use std::rc::Rc;
use std::cell::RefCell;

use dustbox_debugger::interface::Interface;
use debugger::interface::Interface;
use dustbox::debug::Debugger;

fn main() {
10 changes: 1 addition & 9 deletions debugger/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
extern crate gtk;
extern crate gdk;
extern crate gdk_pixbuf;
extern crate cairo;

extern crate dustbox;

pub mod interface;

pub mod interface;
3 changes: 2 additions & 1 deletion disassembler/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[package]
name = "dustbox_disassembler"
name = "disassembler"
version = "0.1.0"
authors = ["Martin Lindhe"]
edition = "2018"

[[bin]]
name = "dustbox-disasm"
3 changes: 0 additions & 3 deletions disassembler/src/disassembler-main.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
extern crate chrono;
use chrono::prelude::*;

extern crate dustbox;
use dustbox::machine::Machine;
use dustbox::cpu::{Decoder};
use dustbox::debug::ProgramTracer;
use dustbox::tools;

extern crate clap;
use clap::{Arg, App};

fn main() {
8 changes: 0 additions & 8 deletions dustbox/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
#![allow(dead_code)]

extern crate bincode;
extern crate chrono;
extern crate rand;
extern crate rand_xorshift;
extern crate sdl2;
extern crate tempfile;
extern crate toml;

#[macro_use]
extern crate serde_derive;

1 change: 1 addition & 0 deletions dustbox/src/tools.rs
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ use std::io::Read;
use std::io::Error;

pub fn read_binary(path: &str) -> Result<Vec<u8>, Error> {
// TODO take Path arg instead
let mut buffer: Vec<u8> = Vec::new();

let mut f = match File::open(path) {
3 changes: 2 additions & 1 deletion frontend/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[package]
name = "dustbox_frontend"
name = "frontend"
version = "0.1.0"
authors = ["Martin Lindhe"]
edition = "2018"

[[bin]]
name = "dustbox-frontend"
8 changes: 3 additions & 5 deletions frontend/src/frontend-main.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use std::time::{Duration, SystemTime};
use std::thread::sleep;

extern crate sdl2;
use sdl2::event::Event;
use sdl2::pixels;
use sdl2::pixels::PixelFormatEnum;
@@ -10,7 +9,6 @@ use sdl2::pixels::PixelFormatEnum;
extern crate clap;
use clap::{Arg, App};

extern crate dustbox;
use dustbox::machine::Machine;
use dustbox::tools;

@@ -68,7 +66,7 @@ fn main() {
let sdl_context = sdl2::init().unwrap();
let video_subsys = sdl_context.video().unwrap();

let scale_factor = value_t!(matches, "SCALE", f32).unwrap_or(1.);
let scale_factor = value_t!(matches, "SCALE", f32).unwrap_or(2.);

let initial_screen_width = (320. * scale_factor) as u32;
let initial_screen_height = (200. * scale_factor) as u32;
@@ -142,8 +140,8 @@ fn main() {
};

// window size is the display size
let window_width = (frame.mode.swidth as f32 * internal_scale_x) as u32;
let window_height = ((frame.mode.sheight as f32 * internal_scale_y)) as u32;
let window_width = (frame.mode.swidth as f32 * internal_scale_x) as u32;
let window_height = (frame.mode.sheight as f32 * internal_scale_y) as u32;

println!("Resizing window for mode {:02x} to {}x{} pixels, {}x{} frame size, scale factor {}x, internal scale x:{}, y:{}",
frame.mode.mode, window_width, window_height, frame.mode.swidth, frame.mode.sheight, scale_factor, internal_scale_x, internal_scale_y);
3 changes: 2 additions & 1 deletion fuzzer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[package]
name = "dustbox_fuzzer"
name = "fuzzer"
version = "0.1.0"
authors = ["Martin Lindhe"]
edition = "2018"

[lib]
path = "src/lib.rs"
17 changes: 5 additions & 12 deletions fuzzer/src/bin/fuzzer-main.rs
Original file line number Diff line number Diff line change
@@ -2,16 +2,11 @@
extern crate clap;
use clap::{Arg, App};

extern crate dustbox;
extern crate dustbox_fuzzer;

extern crate rand;
extern crate rand_xorshift;
use rand::prelude::*;
use rand_xorshift::XorShiftRng;

use dustbox::cpu::Op;
use dustbox_fuzzer::fuzzer::{fuzz_ops, FuzzConfig, CodeRunner};
use fuzzer::fuzzer::{fuzz_ops, FuzzConfig, CodeRunner};

fn main() {
let matches = App::new("dustbox-fuzzer")
@@ -90,13 +85,11 @@ fn main() {

// seed prng if argument was given
let mut rng: XorShiftRng;
let seed_value: u64;
if matches.is_present("SEED") {
seed_value = value_t!(matches, "SEED", u64).unwrap();
let seed_value = if matches.is_present("SEED") {
value_t!(matches, "SEED", u64).unwrap()
} else {
let mut tmp = XorShiftRng::from_entropy();
seed_value = tmp.gen();
}
XorShiftRng::from_entropy().gen()
};

rng = XorShiftRng::seed_from_u64(seed_value);
println!("rng seed = {}", seed_value);
6 changes: 0 additions & 6 deletions fuzzer/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
extern crate rand;
extern crate curl;
extern crate tempfile;
extern crate tera;
extern crate dustbox;

pub mod fuzzer;

0 comments on commit 6448451

Please sign in to comment.