Skip to content

Commit

Permalink
Merge pull request #5 from NightShade256/development
Browse files Browse the repository at this point in the history
v1.1.0
  • Loading branch information
NightShade256 authored Jan 15, 2021
2 parents ab602df + 92d5bb9 commit c53b670
Show file tree
Hide file tree
Showing 9 changed files with 228 additions and 16 deletions.
31 changes: 29 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ members = [

[package]
name = "ferrous-ch8"
version = "1.0.2"
version = "1.1.0"
authors = ["Anish Jewalikar <anishjewalikar@gmail.com>"]
edition = "2018"
description = "A simple, full featured (super) Chip-8 interpreter."
Expand All @@ -14,13 +14,15 @@ readme = "README.md"
repository = "https://github.com/NightShade256/ferrous-ch8"

[dependencies]
ferrous-core = { path = "./ferrous-core" }
ferrous-core = { path = "./ferrous-core", features = ["savestates"] }
glium = "0.29.0"
imgui = "0.6.1"
imgui-glium-renderer = "0.6.1"
imgui-memory-editor = { git = "https://github.com/NightShade256/rust-imgui-memory-editor" }
imgui-winit-support = "0.6.1"
nfd2 = "0.2.3"
rodio = "0.13.0"
serde_json = "1.0.61"

[profile.release]
lto = "fat"
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,15 @@ documented and you shouldn't have a problem.
3. Ability to dynamically change FG, BG colours, cycles per frame
and view FPS.

4. Debugger with ability to view work memory, register states, stack and allows
for stepping timers, and opcodes.

![Blinky](./assets/blinky.png)

![Sweetcopter](./assets/sweetcopter.png)

![Debugger](./assets/debugger.png)

## Building

You can build the interpreter through `cargo`.
Expand Down
Binary file added assets/debugger.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ferrous-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ferrous-core"
version = "1.0.2"
version = "1.1.0"
authors = ["Anish Jewalikar <anishjewalikar@gmail.com>"]
edition = "2018"
description = "A simple Chip-8 interpreter backend for Ferrous Chip-8."
Expand Down
2 changes: 1 addition & 1 deletion ferrous-core/src/cpu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ impl CPU {
}

/// Fetch the next opcode that is to be executed from the ROM.
fn fetch_opcode(&self) -> u16 {
pub fn fetch_opcode(&self) -> u16 {
u16::from_be_bytes([self.memory[self.pc], self.memory[self.pc + 1]])
}
}
Expand Down
Binary file added src/assets/FiraMono.ttf
Binary file not shown.
Binary file removed src/assets/Ubuntu.ttf
Binary file not shown.
Loading

0 comments on commit c53b670

Please sign in to comment.