Compare commits
No commits in common. "main" and "multiplayer" have entirely different histories.
main
...
multiplaye
|
|
@ -4,7 +4,6 @@
|
|||
*.html text eol=lf diff=html
|
||||
*.java text eol=lf diff=java
|
||||
*.js text eol=lf diff=js
|
||||
*.sh text eol=lf
|
||||
*.txt text eol=lf
|
||||
|
||||
*.class binary
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/lemur
|
||||
/lemur.exe
|
||||
/shrooms-vb
|
||||
/shrooms-vb.exe
|
||||
.vscode
|
||||
output
|
||||
/target
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
45
Cargo.toml
45
Cargo.toml
|
|
@ -1,58 +1,35 @@
|
|||
[package]
|
||||
name = "lemur"
|
||||
description = "An emulator for the Virtual Boy."
|
||||
repository = "https://git.virtual-boy.com/PVB/lemur"
|
||||
publish = false
|
||||
license = "MIT"
|
||||
version = "0.3.0"
|
||||
name = "shrooms-vb"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1"
|
||||
atoi = "2"
|
||||
atomic = "0.6"
|
||||
bitflags = { version = "2", features = ["serde"] }
|
||||
bitflags = "2"
|
||||
bytemuck = { version = "1", features = ["derive"] }
|
||||
clap = { version = "4", features = ["derive"] }
|
||||
cpal = { git = "https://github.com/sidit77/cpal.git", rev = "66ed6be" }
|
||||
directories = "5"
|
||||
egui = { version = "0.30", features = ["serde"] }
|
||||
egui_extras = { version = "0.30", features = ["image"] }
|
||||
egui-toast = { git = "https://github.com/urholaukkarinen/egui-toast.git", rev = "d0bcf97" }
|
||||
egui-winit = "0.30"
|
||||
egui-wgpu = { version = "0.30", features = ["winit"] }
|
||||
gilrs = { version = "0.11", features = ["serde-serialize"] }
|
||||
hex = "0.4"
|
||||
image = { version = "0.25", default-features = false, features = ["png"] }
|
||||
egui = "0.29"
|
||||
egui_extras = "0.29"
|
||||
egui-winit = "0.29"
|
||||
egui-wgpu = { version = "0.29", features = ["winit"] }
|
||||
gilrs = "0.11"
|
||||
itertools = "0.13"
|
||||
num-derive = "0.4"
|
||||
num-traits = "0.2"
|
||||
oneshot = "0.1"
|
||||
pollster = "0.4"
|
||||
rfd = "0.15"
|
||||
rtrb = "0.3"
|
||||
rubato = "0.16"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
serde_json = "1"
|
||||
thread-priority = "1"
|
||||
tokio = { version = "1", features = ["io-util", "macros", "net", "rt", "sync"] }
|
||||
tracing = { version = "0.1", features = ["release_max_level_info"] }
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||
wgpu = "23"
|
||||
winit = { version = "0.30", features = ["serde"] }
|
||||
wgpu = "22.1"
|
||||
winit = "0.30"
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
windows = { version = "0.58", features = ["Win32_System_Threading"] }
|
||||
|
||||
[build-dependencies]
|
||||
cc = "1"
|
||||
winresource = "0.1"
|
||||
|
||||
[profile.release]
|
||||
lto = true
|
||||
|
||||
[package.metadata.bundle]
|
||||
name = "Lemur"
|
||||
identifier = "com.virtual-boy.Lemur"
|
||||
icon = ["assets/lemur-256x256.png"]
|
||||
category = "games"
|
||||
lto = true
|
||||
18
README.md
18
README.md
|
|
@ -1,25 +1,15 @@
|
|||
# Lemur
|
||||
# Shrooms VB (native)
|
||||
|
||||
A Virtual Boy emulator built around the shrooms-vb core. Written in Rust, using winit, wgpu, and egui. Should run on any major OS.
|
||||
A native implementation of shrooms-vb. Written in Rust, using winit, wgpu, and Dear ImGui. Should run on any major OS.
|
||||
|
||||
## Setup
|
||||
|
||||
Install the following dependencies:
|
||||
- `cargo` (via [rustup](https://rustup.rs/), the version from your package manager is too old)
|
||||
- `cargo`
|
||||
|
||||
Run
|
||||
```sh
|
||||
cargo build --release
|
||||
```
|
||||
|
||||
The executable will be in `target/release/lemur[.exe]`
|
||||
|
||||
## Release
|
||||
|
||||
Bump the version number in `Cargo.toml`, then run this script:
|
||||
|
||||
```sh
|
||||
./scripts/release.sh
|
||||
```
|
||||
|
||||
It uses docker to cross compile for Windows, MacOS, and Linux. All binaries are left in the `output` directory.
|
||||
The executable will be in `target/release/shrooms-vb[.exe]`
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 25 KiB |
BIN
assets/lemur.ico
BIN
assets/lemur.ico
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB |
|
|
@ -1,37 +0,0 @@
|
|||
# This Dockerfile produces a base image for builds.
|
||||
# It includes all dependencies necessary to cross-compile for Windows/MacOS/Linux.
|
||||
|
||||
FROM crazymax/osxcross:latest-ubuntu AS osxcross
|
||||
|
||||
FROM rust:latest
|
||||
RUN rustup target add x86_64-pc-windows-msvc && \
|
||||
rustup target add x86_64-apple-darwin && \
|
||||
rustup target add aarch64-apple-darwin && \
|
||||
apt-get update && \
|
||||
apt-get install -y clang-19 lld-19 libc6-dev libasound2-dev libudev-dev genisoimage mingw-w64 && \
|
||||
cargo install cargo-bundle xwin && \
|
||||
xwin --accept-license splat --output xwin && \
|
||||
rm -rf .xwin-cache && \
|
||||
ln -s $(which clang-19) /usr/bin/clang && \
|
||||
ln -s $(which clang++-19) /usr/bin/clang++
|
||||
COPY --from=osxcross /osxcross /osxcross
|
||||
|
||||
ENV PATH="/osxcross/bin:$PATH" \
|
||||
LD_LIBRARY_PATH="/osxcross/lib" \
|
||||
CC="clang-19" CXX="clang++-19" AR="llvm-ar-19" \
|
||||
CC_x86_64-apple-darwin="o64-clang" \
|
||||
CXX_x86_64-apple-darwin="o64-clang++" \
|
||||
CC_aarch64-apple-darwin="oa64-clang" \
|
||||
CXX_aarch64-apple-darwin="o6a4-clang++" \
|
||||
SHROOMS_CFLAGS_x86_64-unknown-linux-gnu="-flto" \
|
||||
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-Clinker-plugin-lto -Clinker=clang -Clink-arg=-fuse-ld=lld" \
|
||||
SHROOMS_CFLAGS_x86_64-pc-windows-msvc="-flto" \
|
||||
CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_RUSTFLAGS="-Lnative=/xwin/crt/lib/x86_64 -Lnative=/xwin/sdk/lib/um/x86_64 -Lnative=/xwin/sdk/lib/ucrt/x86_64 -Clinker-plugin-lto -Clink-arg=-fuse-ld=lld" \
|
||||
CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link-19" \
|
||||
CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER="o64-clang" \
|
||||
CARGO_TARGET_X86_64_APPLE_DARWIN_AR="llvm-ar-19" \
|
||||
CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER="oa64-clang" \
|
||||
CARGO_TARGET_AARCH64_APPLE_DARWIN_AR="llvm-ar-19" \
|
||||
CROSS_COMPILE="setting-this-to-silence-a-warning-" \
|
||||
RC_PATH="llvm-rc-19" \
|
||||
MACOSX_DEPLOYMENT_TARGET="14.5"
|
||||
28
build.rs
28
build.rs
|
|
@ -1,34 +1,14 @@
|
|||
use std::{error::Error, path::Path};
|
||||
|
||||
fn main() -> Result<(), Box<dyn Error>> {
|
||||
if std::env::var("CARGO_CFG_TARGET_OS")? == "windows" {
|
||||
let mut res = winresource::WindowsResource::new();
|
||||
res.set_icon("assets/lemur.ico");
|
||||
res.compile()?;
|
||||
}
|
||||
use std::path::Path;
|
||||
|
||||
fn main() {
|
||||
println!("cargo::rerun-if-changed=shrooms-vb-core");
|
||||
|
||||
let mut builder = cc::Build::new();
|
||||
let _ = builder.try_flags_from_environment("SHROOMS_CFLAGS");
|
||||
let opt_level = if builder.get_compiler().is_like_msvc() {
|
||||
2
|
||||
} else {
|
||||
3
|
||||
};
|
||||
builder
|
||||
cc::Build::new()
|
||||
.include(Path::new("shrooms-vb-core/core"))
|
||||
.opt_level(opt_level)
|
||||
.opt_level(2)
|
||||
.flag_if_supported("-fno-strict-aliasing")
|
||||
.define("VB_LITTLE_ENDIAN", None)
|
||||
.define("VB_SIGNED_PROPAGATE", None)
|
||||
.define("VB_DIV_GENERIC", None)
|
||||
.define("VB_DIRECT_EXECUTE", "on_execute")
|
||||
.define("VB_DIRECT_FRAME", "on_frame")
|
||||
.define("VB_DIRECT_READ", "on_read")
|
||||
.define("VB_DIRECT_WRITE", "on_write")
|
||||
.file(Path::new("shrooms-vb-core/core/vb.c"))
|
||||
.compile("vb");
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
# Set everything up
|
||||
rm -rf output
|
||||
mkdir -p output
|
||||
cargo clean
|
||||
|
||||
# Build for linux
|
||||
cargo build --release
|
||||
cp target/release/lemur output/lemur-linux
|
||||
|
||||
# Bundle for Linux
|
||||
cargo bundle --release --format deb
|
||||
cp target/release/bundle/deb/*.deb output
|
||||
|
||||
# Build for Windows
|
||||
cargo build --release --target x86_64-pc-windows-msvc
|
||||
cp target/x86_64-pc-windows-msvc/release/lemur.exe output
|
||||
|
||||
# Build for MacOS Intel
|
||||
cargo build --release --target x86_64-apple-darwin
|
||||
cp target/x86_64-apple-darwin/release/lemur output/lemur-osx-intel
|
||||
|
||||
# Bundle for MacOS Intel
|
||||
cargo bundle --release --target x86_64-apple-darwin --format osx
|
||||
genisoimage -V lemur -D -R -apple -no-pad -o output/Lemur-Intel.dmg target/x86_64-apple-darwin/release/bundle/osx
|
||||
|
||||
# Build for MacOS Apple Silicon
|
||||
cargo build --release --target aarch64-apple-darwin
|
||||
cp target/aarch64-apple-darwin/release/lemur output/lemur-osx-apple-silicon
|
||||
|
||||
# Bundle for MacOS Apple Silicon
|
||||
cargo bundle --release --target aarch64-apple-darwin --format osx
|
||||
genisoimage -V lemur -D -R -apple -no-pad -o output/Lemur-Apple-Silicon.dmg target/aarch64-apple-darwin/release/bundle/osx
|
||||
|
||||
# Clean up after ourselves
|
||||
cargo clean
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
set -e
|
||||
version=$(cat Cargo.toml | sed -n -e '/version/ {s/.* = *//p;q}' | tr -d '"')
|
||||
|
||||
read -p "You wanted to release $version, right? [Y/n] " -n 1 -r
|
||||
echo
|
||||
case "$REPLY" in
|
||||
n|N ) exit 1;;
|
||||
esac
|
||||
|
||||
if [ -z "${RELEASE_TOKEN}" ]; then
|
||||
echo "Please set the RELEASE_TOKEN env var."
|
||||
exit 1
|
||||
fi
|
||||
if ! command -v curl 2>&1 >/dev/null; then
|
||||
echo "Please install curl."
|
||||
exit 1
|
||||
fi
|
||||
if ! command -v jq 2>&1 >/dev/null; then
|
||||
echo "Please install jq."
|
||||
exit 1
|
||||
fi
|
||||
if ! command -v docker 2>&1 >/dev/null; then
|
||||
echo "Please install docker."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
docker build -f build.Dockerfile -t lemur-build .
|
||||
MSYS_NO_PATHCONV=1 docker run -it --rm -v .:/app -w /app --entrypoint bash lemur-build /app/scripts/do-bundle.sh
|
||||
|
||||
body=$(cat <<EOF
|
||||
## How to install
|
||||
|
||||
The emulator can be found in the "Downloads" section of this release.
|
||||
|
||||
### Windows users
|
||||
|
||||
Download \`lemur.exe\`.
|
||||
|
||||
### MacOS users
|
||||
|
||||
If your Mac uses an Intel processor, download and install \`Lemur-Intel.dmg\`.
|
||||
|
||||
If it uses Apple Silicon, download and install \`Lemur-Apple-Silicon.dmg\`.
|
||||
|
||||
If you're not sure which to choose, use [this guide](https://support.apple.com/en-us/116943) to find out.
|
||||
|
||||
### Linux users
|
||||
|
||||
You can either download and run \`lemur-linux\`, or download and install the attached .deb file.
|
||||
EOF
|
||||
)
|
||||
|
||||
payload=$(cat <<EOF
|
||||
{
|
||||
"body": $(echo "$body" | jq -Rsa .),
|
||||
"draft": false,
|
||||
"name": "v${version}",
|
||||
"prerelease": false,
|
||||
"tag_name": "v${version}"
|
||||
}
|
||||
EOF
|
||||
)
|
||||
|
||||
echo "Creating release..."
|
||||
response=$(curl -s --json "$payload" "https://git.virtual-boy.com/api/v1/repos/PVB/lemur/releases?token=$RELEASE_TOKEN")
|
||||
echo "$response"
|
||||
upload_url=$(echo "$response" | jq -r '.upload_url')
|
||||
for file in output/*; do
|
||||
echo "Uploading $(basename "$file")..."
|
||||
upload_res=$(curl -s -F "attachment=@$file" "$upload_url?name=$(basename "$file")&token=$RELEASE_TOKEN")
|
||||
echo "$upload_res"
|
||||
done
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 155a3aa678ee0c65ed8703bccc48d36f81da1db5
|
||||
Subproject commit 18b2c589e6cacec5a0bd0f450cedf2f8fe3a2bc8
|
||||
|
|
@ -49,31 +49,7 @@ struct Colors {
|
|||
var<uniform> colors: Colors;
|
||||
|
||||
@fragment
|
||||
fn fs_lefteye(in: VertexOutput) -> @location(0) vec4<f32> {
|
||||
let brt = textureSample(u_texture, u_sampler, in.tex_coords);
|
||||
return colors.left * brt[0];
|
||||
}
|
||||
|
||||
@fragment
|
||||
fn fs_righteye(in: VertexOutput) -> @location(0) vec4<f32> {
|
||||
let brt = textureSample(u_texture, u_sampler, in.tex_coords);
|
||||
return colors.left * brt[1];
|
||||
}
|
||||
|
||||
@fragment
|
||||
fn fs_anaglyph(in: VertexOutput) -> @location(0) vec4<f32> {
|
||||
fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
|
||||
let brt = textureSample(u_texture, u_sampler, in.tex_coords);
|
||||
return colors.left * brt[0] + colors.right * brt[1];
|
||||
}
|
||||
|
||||
@fragment
|
||||
fn fs_sidebyside(in: VertexOutput) -> @location(0) vec4<f32> {
|
||||
var point = in.tex_coords;
|
||||
point.x = (point.x * 2.0) % 1.0;
|
||||
let brt = textureSample(u_texture, u_sampler, point);
|
||||
if in.tex_coords.x < 0.5 {
|
||||
return colors.left * brt[0];
|
||||
} else {
|
||||
return colors.left * brt[1];
|
||||
};
|
||||
}
|
||||
152
src/app.rs
152
src/app.rs
|
|
@ -1,12 +1,11 @@
|
|||
use std::{collections::HashSet, num::NonZero, sync::Arc, thread, time::Duration};
|
||||
use std::{collections::HashSet, num::NonZero, sync::Arc, thread};
|
||||
|
||||
use egui::{
|
||||
ahash::{HashMap, HashMapExt},
|
||||
Context, FontData, FontDefinitions, FontFamily, IconData, TextWrapMode, ViewportBuilder,
|
||||
ViewportCommand, ViewportId, ViewportInfo,
|
||||
Context, FontData, FontDefinitions, FontFamily, TextWrapMode, ViewportBuilder, ViewportCommand,
|
||||
ViewportId, ViewportInfo,
|
||||
};
|
||||
use gilrs::{EventType, Gilrs};
|
||||
use tracing::{error, warn};
|
||||
use winit::{
|
||||
application::ApplicationHandler,
|
||||
event::WindowEvent,
|
||||
|
|
@ -16,44 +15,23 @@ use winit::{
|
|||
|
||||
use crate::{
|
||||
controller::ControllerManager,
|
||||
emulator::{EmulatorClient, EmulatorCommand, SimId},
|
||||
emulator::{EmulatorClient, SimId},
|
||||
input::MappingProvider,
|
||||
persistence::Persistence,
|
||||
window::{AboutWindow, AppWindow, GameWindow, GdbServerWindow, InputWindow},
|
||||
window::{AppWindow, GameWindow, InputWindow},
|
||||
};
|
||||
|
||||
fn load_icon() -> anyhow::Result<IconData> {
|
||||
let bytes = include_bytes!("../assets/lemur-256x256.png");
|
||||
let img = image::load_from_memory_with_format(bytes, image::ImageFormat::Png)?;
|
||||
let rgba = img.into_rgba8();
|
||||
Ok(IconData {
|
||||
width: rgba.width(),
|
||||
height: rgba.height(),
|
||||
rgba: rgba.into_vec(),
|
||||
})
|
||||
}
|
||||
|
||||
pub struct Application {
|
||||
icon: Option<Arc<IconData>>,
|
||||
client: EmulatorClient,
|
||||
proxy: EventLoopProxy<UserEvent>,
|
||||
mappings: MappingProvider,
|
||||
controllers: ControllerManager,
|
||||
persistence: Persistence,
|
||||
viewports: HashMap<ViewportId, Viewport>,
|
||||
focused: Option<ViewportId>,
|
||||
init_debug_port: Option<u16>,
|
||||
}
|
||||
|
||||
impl Application {
|
||||
pub fn new(
|
||||
client: EmulatorClient,
|
||||
proxy: EventLoopProxy<UserEvent>,
|
||||
debug_port: Option<u16>,
|
||||
) -> Self {
|
||||
let icon = load_icon().ok().map(Arc::new);
|
||||
let persistence = Persistence::new();
|
||||
let mappings = MappingProvider::new(persistence.clone());
|
||||
pub fn new(client: EmulatorClient, proxy: EventLoopProxy<UserEvent>) -> Self {
|
||||
let mappings = MappingProvider::new();
|
||||
let controllers = ControllerManager::new(client.clone(), &mappings);
|
||||
{
|
||||
let mappings = mappings.clone();
|
||||
|
|
@ -61,15 +39,12 @@ impl Application {
|
|||
thread::spawn(|| process_gamepad_input(mappings, proxy));
|
||||
}
|
||||
Self {
|
||||
icon,
|
||||
client,
|
||||
proxy,
|
||||
mappings,
|
||||
controllers,
|
||||
persistence,
|
||||
viewports: HashMap::new(),
|
||||
focused: None,
|
||||
init_debug_port: debug_port,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -78,28 +53,17 @@ impl Application {
|
|||
if self.viewports.contains_key(&viewport_id) {
|
||||
return;
|
||||
}
|
||||
self.viewports.insert(
|
||||
viewport_id,
|
||||
Viewport::new(event_loop, self.icon.clone(), window),
|
||||
);
|
||||
self.viewports
|
||||
.insert(viewport_id, Viewport::new(event_loop, window));
|
||||
}
|
||||
}
|
||||
|
||||
impl ApplicationHandler<UserEvent> for Application {
|
||||
fn resumed(&mut self, event_loop: &ActiveEventLoop) {
|
||||
if let Some(port) = self.init_debug_port {
|
||||
let mut server =
|
||||
GdbServerWindow::new(SimId::Player1, self.client.clone(), self.proxy.clone());
|
||||
server.launch(port);
|
||||
self.open(event_loop, Box::new(server));
|
||||
}
|
||||
let app = GameWindow::new(
|
||||
self.client.clone(),
|
||||
self.proxy.clone(),
|
||||
self.persistence.clone(),
|
||||
SimId::Player1,
|
||||
);
|
||||
self.open(event_loop, Box::new(app));
|
||||
let app = GameWindow::new(self.client.clone(), self.proxy.clone(), SimId::Player1);
|
||||
let wrapper = Viewport::new(event_loop, Box::new(app));
|
||||
self.focused = Some(wrapper.id());
|
||||
self.viewports.insert(wrapper.id(), wrapper);
|
||||
}
|
||||
|
||||
fn window_event(
|
||||
|
|
@ -190,35 +154,14 @@ impl ApplicationHandler<UserEvent> for Application {
|
|||
};
|
||||
viewport.app.handle_gamepad_event(&event);
|
||||
}
|
||||
UserEvent::OpenAbout => {
|
||||
let about = AboutWindow;
|
||||
self.open(event_loop, Box::new(about));
|
||||
}
|
||||
UserEvent::OpenDebugger(sim_id) => {
|
||||
let debugger =
|
||||
GdbServerWindow::new(sim_id, self.client.clone(), self.proxy.clone());
|
||||
self.open(event_loop, Box::new(debugger));
|
||||
}
|
||||
UserEvent::OpenInput => {
|
||||
let input = InputWindow::new(self.mappings.clone());
|
||||
self.open(event_loop, Box::new(input));
|
||||
}
|
||||
UserEvent::OpenPlayer2 => {
|
||||
let p2 = GameWindow::new(
|
||||
self.client.clone(),
|
||||
self.proxy.clone(),
|
||||
self.persistence.clone(),
|
||||
SimId::Player2,
|
||||
);
|
||||
let p2 = GameWindow::new(self.client.clone(), self.proxy.clone(), SimId::Player2);
|
||||
self.open(event_loop, Box::new(p2));
|
||||
}
|
||||
UserEvent::Quit(sim_id) => {
|
||||
self.viewports
|
||||
.retain(|_, viewport| viewport.app.sim_id() != sim_id);
|
||||
if !self.viewports.contains_key(&ViewportId::ROOT) {
|
||||
event_loop.exit();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -227,15 +170,6 @@ impl ApplicationHandler<UserEvent> for Application {
|
|||
viewport.window.request_redraw();
|
||||
}
|
||||
}
|
||||
|
||||
fn exiting(&mut self, _event_loop: &ActiveEventLoop) {
|
||||
let (sender, receiver) = oneshot::channel();
|
||||
if self.client.send_command(EmulatorCommand::Exit(sender)) {
|
||||
if let Err(error) = receiver.recv_timeout(Duration::from_secs(5)) {
|
||||
error!(%error, "could not gracefully exit.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct Viewport {
|
||||
|
|
@ -249,18 +183,20 @@ struct Viewport {
|
|||
app: Box<dyn AppWindow>,
|
||||
}
|
||||
impl Viewport {
|
||||
pub fn new(
|
||||
event_loop: &ActiveEventLoop,
|
||||
icon: Option<Arc<IconData>>,
|
||||
mut app: Box<dyn AppWindow>,
|
||||
) -> Self {
|
||||
pub fn new(event_loop: &ActiveEventLoop, mut app: Box<dyn AppWindow>) -> Self {
|
||||
let mut painter = egui_wgpu::winit::Painter::new(
|
||||
egui_wgpu::WgpuConfiguration::default(),
|
||||
1,
|
||||
None,
|
||||
false,
|
||||
true,
|
||||
);
|
||||
|
||||
let ctx = Context::default();
|
||||
let mut fonts = FontDefinitions::default();
|
||||
let mut fonts = FontDefinitions::empty();
|
||||
fonts.font_data.insert(
|
||||
"Selawik".into(),
|
||||
Arc::new(FontData::from_static(include_bytes!(
|
||||
"../assets/selawik.ttf"
|
||||
))),
|
||||
FontData::from_static(include_bytes!("../assets/selawik.ttf")),
|
||||
);
|
||||
fonts
|
||||
.families
|
||||
|
|
@ -272,31 +208,9 @@ impl Viewport {
|
|||
s.wrap_mode = Some(TextWrapMode::Extend);
|
||||
s.visuals.menu_rounding = Default::default();
|
||||
});
|
||||
egui_extras::install_image_loaders(&ctx);
|
||||
|
||||
#[allow(unused_mut)]
|
||||
let mut wgpu_config = egui_wgpu::WgpuConfiguration {
|
||||
present_mode: wgpu::PresentMode::AutoNoVsync,
|
||||
..egui_wgpu::WgpuConfiguration::default()
|
||||
};
|
||||
#[cfg(windows)]
|
||||
{
|
||||
if let egui_wgpu::WgpuSetup::CreateNew {
|
||||
supported_backends, ..
|
||||
} = &mut wgpu_config.wgpu_setup
|
||||
{
|
||||
*supported_backends -= wgpu::Backends::VULKAN;
|
||||
}
|
||||
}
|
||||
|
||||
let mut painter =
|
||||
egui_wgpu::winit::Painter::new(ctx.clone(), wgpu_config, 1, None, false, true);
|
||||
|
||||
let mut info = ViewportInfo::default();
|
||||
let mut builder = app.initial_viewport();
|
||||
if let Some(icon) = icon {
|
||||
builder = builder.with_icon(icon);
|
||||
}
|
||||
let builder = app.initial_viewport();
|
||||
let (window, state) = create_window_and_state(&ctx, event_loop, &builder, &mut painter);
|
||||
egui_winit::update_viewport_info(&mut info, &ctx, &window, true);
|
||||
|
||||
|
|
@ -357,7 +271,7 @@ impl Viewport {
|
|||
[0.0, 0.0, 0.0, 0.0],
|
||||
&clipped_primitives,
|
||||
&output.textures_delta,
|
||||
vec![],
|
||||
false,
|
||||
);
|
||||
|
||||
self.state
|
||||
|
|
@ -402,11 +316,8 @@ impl Drop for Viewport {
|
|||
#[derive(Debug)]
|
||||
pub enum UserEvent {
|
||||
GamepadEvent(gilrs::Event),
|
||||
OpenAbout,
|
||||
OpenDebugger(SimId),
|
||||
OpenInput,
|
||||
OpenPlayer2,
|
||||
Quit(SimId),
|
||||
}
|
||||
|
||||
pub enum Action {
|
||||
|
|
@ -435,12 +346,9 @@ fn create_window_and_state(
|
|||
}
|
||||
|
||||
fn process_gamepad_input(mappings: MappingProvider, proxy: EventLoopProxy<UserEvent>) {
|
||||
let mut gilrs = match Gilrs::new() {
|
||||
Ok(gilrs) => gilrs,
|
||||
Err(error) => {
|
||||
warn!(%error, "could not connect gamepad listener");
|
||||
return;
|
||||
}
|
||||
let Ok(mut gilrs) = Gilrs::new() else {
|
||||
eprintln!("could not connect gamepad listener");
|
||||
return;
|
||||
};
|
||||
while let Some(event) = gilrs.next_event_blocking(None) {
|
||||
if event.event == EventType::Connected {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ use anyhow::{bail, Result};
|
|||
use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
|
||||
use itertools::Itertools;
|
||||
use rubato::{FftFixedInOut, Resampler};
|
||||
use tracing::error;
|
||||
|
||||
pub struct Audio {
|
||||
#[allow(unused)]
|
||||
|
|
@ -55,7 +54,7 @@ impl Audio {
|
|||
}
|
||||
chunk.commit_all();
|
||||
},
|
||||
move |error| error!(%error, "stream error"),
|
||||
move |err| eprintln!("stream error: {err}"),
|
||||
None,
|
||||
)?;
|
||||
stream.play()?;
|
||||
|
|
|
|||
631
src/emulator.rs
631
src/emulator.rs
|
|
@ -1,29 +1,32 @@
|
|||
use std::{
|
||||
collections::HashMap,
|
||||
fmt::Display,
|
||||
fs::{self, File},
|
||||
io::{Read, Seek, SeekFrom, Write},
|
||||
fs,
|
||||
path::{Path, PathBuf},
|
||||
sync::{
|
||||
atomic::{AtomicBool, Ordering},
|
||||
atomic::{AtomicBool, AtomicUsize, Ordering},
|
||||
mpsc::{self, RecvError, TryRecvError},
|
||||
Arc,
|
||||
},
|
||||
};
|
||||
|
||||
use anyhow::Result;
|
||||
use atomic::Atomic;
|
||||
use bytemuck::NoUninit;
|
||||
use egui_toast::{Toast, ToastKind, ToastOptions};
|
||||
use tracing::{error, warn};
|
||||
|
||||
use crate::{audio::Audio, graphics::TextureSink};
|
||||
use shrooms_vb_core::{Sim, StopReason, EXPECTED_FRAME_SIZE};
|
||||
pub use shrooms_vb_core::{VBKey, VBRegister, VBWatchpointType};
|
||||
pub use shrooms_vb_core::VBKey;
|
||||
use shrooms_vb_core::{Sim, EXPECTED_FRAME_SIZE};
|
||||
|
||||
mod address_set;
|
||||
mod shrooms_vb_core;
|
||||
|
||||
pub struct EmulatorBuilder {
|
||||
rom: Option<PathBuf>,
|
||||
commands: mpsc::Receiver<EmulatorCommand>,
|
||||
sim_count: Arc<AtomicUsize>,
|
||||
running: Arc<[AtomicBool; 2]>,
|
||||
has_game: Arc<[AtomicBool; 2]>,
|
||||
audio_on: Arc<[AtomicBool; 2]>,
|
||||
linked: Arc<AtomicBool>,
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)]
|
||||
pub enum SimId {
|
||||
Player1,
|
||||
|
|
@ -40,61 +43,6 @@ impl SimId {
|
|||
}
|
||||
}
|
||||
}
|
||||
impl Display for SimId {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
f.write_str(match self {
|
||||
Self::Player1 => "Player 1",
|
||||
Self::Player2 => "Player 2",
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
struct Cart {
|
||||
rom_path: PathBuf,
|
||||
rom: Vec<u8>,
|
||||
sram_file: File,
|
||||
sram: Vec<u8>,
|
||||
}
|
||||
|
||||
impl Cart {
|
||||
fn load(rom_path: &Path, sim_id: SimId) -> Result<Self> {
|
||||
let rom = fs::read(rom_path)?;
|
||||
|
||||
let mut sram_file = File::options()
|
||||
.read(true)
|
||||
.write(true)
|
||||
.create(true)
|
||||
.truncate(false)
|
||||
.open(sram_path(rom_path, sim_id))?;
|
||||
sram_file.set_len(8 * 1024)?;
|
||||
|
||||
let mut sram = vec![];
|
||||
sram_file.read_to_end(&mut sram)?;
|
||||
Ok(Cart {
|
||||
rom_path: rom_path.to_path_buf(),
|
||||
rom,
|
||||
sram_file,
|
||||
sram,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn sram_path(rom_path: &Path, sim_id: SimId) -> PathBuf {
|
||||
match sim_id {
|
||||
SimId::Player1 => rom_path.with_extension("p1.sram"),
|
||||
SimId::Player2 => rom_path.with_extension("p2.sram"),
|
||||
}
|
||||
}
|
||||
|
||||
pub struct EmulatorBuilder {
|
||||
rom: Option<PathBuf>,
|
||||
commands: mpsc::Receiver<EmulatorCommand>,
|
||||
sim_state: Arc<[Atomic<SimState>; 2]>,
|
||||
state: Arc<Atomic<EmulatorState>>,
|
||||
audio_on: Arc<[AtomicBool; 2]>,
|
||||
linked: Arc<AtomicBool>,
|
||||
start_paused: bool,
|
||||
}
|
||||
|
||||
impl EmulatorBuilder {
|
||||
pub fn new() -> (Self, EmulatorClient) {
|
||||
|
|
@ -102,19 +50,17 @@ impl EmulatorBuilder {
|
|||
let builder = Self {
|
||||
rom: None,
|
||||
commands,
|
||||
sim_state: Arc::new([
|
||||
Atomic::new(SimState::Uninitialized),
|
||||
Atomic::new(SimState::Uninitialized),
|
||||
]),
|
||||
state: Arc::new(Atomic::new(EmulatorState::Paused)),
|
||||
sim_count: Arc::new(AtomicUsize::new(0)),
|
||||
running: Arc::new([AtomicBool::new(false), AtomicBool::new(false)]),
|
||||
has_game: Arc::new([AtomicBool::new(false), AtomicBool::new(false)]),
|
||||
audio_on: Arc::new([AtomicBool::new(true), AtomicBool::new(true)]),
|
||||
linked: Arc::new(AtomicBool::new(false)),
|
||||
start_paused: false,
|
||||
};
|
||||
let client = EmulatorClient {
|
||||
queue,
|
||||
sim_state: builder.sim_state.clone(),
|
||||
state: builder.state.clone(),
|
||||
sim_count: builder.sim_count.clone(),
|
||||
running: builder.running.clone(),
|
||||
has_game: builder.has_game.clone(),
|
||||
audio_on: builder.audio_on.clone(),
|
||||
linked: builder.linked.clone(),
|
||||
};
|
||||
|
|
@ -128,26 +74,17 @@ impl EmulatorBuilder {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn start_paused(self, paused: bool) -> Self {
|
||||
Self {
|
||||
start_paused: paused,
|
||||
..self
|
||||
}
|
||||
}
|
||||
|
||||
pub fn build(self) -> Result<Emulator> {
|
||||
let mut emulator = Emulator::new(
|
||||
self.commands,
|
||||
self.sim_state,
|
||||
self.state,
|
||||
self.sim_count,
|
||||
self.running,
|
||||
self.has_game,
|
||||
self.audio_on,
|
||||
self.linked,
|
||||
)?;
|
||||
if let Some(path) = self.rom {
|
||||
emulator.load_cart(SimId::Player1, &path)?;
|
||||
}
|
||||
if self.start_paused {
|
||||
emulator.pause_sims()?;
|
||||
emulator.load_rom(SimId::Player1, &path)?;
|
||||
}
|
||||
Ok(emulator)
|
||||
}
|
||||
|
|
@ -155,83 +92,69 @@ impl EmulatorBuilder {
|
|||
|
||||
pub struct Emulator {
|
||||
sims: Vec<Sim>,
|
||||
carts: [Option<Cart>; 2],
|
||||
audio: Audio,
|
||||
commands: mpsc::Receiver<EmulatorCommand>,
|
||||
sim_state: Arc<[Atomic<SimState>; 2]>,
|
||||
state: Arc<Atomic<EmulatorState>>,
|
||||
sim_count: Arc<AtomicUsize>,
|
||||
running: Arc<[AtomicBool; 2]>,
|
||||
has_game: Arc<[AtomicBool; 2]>,
|
||||
audio_on: Arc<[AtomicBool; 2]>,
|
||||
linked: Arc<AtomicBool>,
|
||||
renderers: HashMap<SimId, TextureSink>,
|
||||
messages: HashMap<SimId, mpsc::Sender<Toast>>,
|
||||
debuggers: HashMap<SimId, DebugInfo>,
|
||||
eye_contents: Vec<u8>,
|
||||
audio_samples: Vec<f32>,
|
||||
}
|
||||
|
||||
impl Emulator {
|
||||
fn new(
|
||||
commands: mpsc::Receiver<EmulatorCommand>,
|
||||
sim_state: Arc<[Atomic<SimState>; 2]>,
|
||||
state: Arc<Atomic<EmulatorState>>,
|
||||
sim_count: Arc<AtomicUsize>,
|
||||
running: Arc<[AtomicBool; 2]>,
|
||||
has_game: Arc<[AtomicBool; 2]>,
|
||||
audio_on: Arc<[AtomicBool; 2]>,
|
||||
linked: Arc<AtomicBool>,
|
||||
) -> Result<Self> {
|
||||
Ok(Self {
|
||||
sims: vec![],
|
||||
carts: [None, None],
|
||||
audio: Audio::init()?,
|
||||
commands,
|
||||
sim_state,
|
||||
state,
|
||||
sim_count,
|
||||
running,
|
||||
has_game,
|
||||
audio_on,
|
||||
linked,
|
||||
renderers: HashMap::new(),
|
||||
messages: HashMap::new(),
|
||||
debuggers: HashMap::new(),
|
||||
eye_contents: vec![0u8; 384 * 224 * 2],
|
||||
audio_samples: Vec::with_capacity(EXPECTED_FRAME_SIZE),
|
||||
})
|
||||
}
|
||||
|
||||
pub fn load_cart(&mut self, sim_id: SimId, path: &Path) -> Result<()> {
|
||||
let cart = Cart::load(path, sim_id)?;
|
||||
self.reset_sim(sim_id, Some(cart))?;
|
||||
pub fn load_rom(&mut self, sim_id: SimId, path: &Path) -> Result<()> {
|
||||
let bytes = fs::read(path)?;
|
||||
self.reset_sim(sim_id, Some(bytes))?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn start_second_sim(&mut self, rom: Option<PathBuf>) -> Result<()> {
|
||||
let rom_path = if let Some(path) = rom {
|
||||
Some(path)
|
||||
let bytes = if let Some(path) = rom {
|
||||
Some(fs::read(path)?)
|
||||
} else {
|
||||
self.carts[0].as_ref().map(|c| c.rom_path.clone())
|
||||
self.sims.first().and_then(|s| s.clone_rom())
|
||||
};
|
||||
let cart = match rom_path {
|
||||
Some(rom_path) => Some(Cart::load(&rom_path, SimId::Player2)?),
|
||||
None => None,
|
||||
};
|
||||
self.reset_sim(SimId::Player2, cart)?;
|
||||
self.reset_sim(SimId::Player2, bytes)?;
|
||||
self.link_sims();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn reset_sim(&mut self, sim_id: SimId, new_cart: Option<Cart>) -> Result<()> {
|
||||
self.save_sram(sim_id)?;
|
||||
|
||||
fn reset_sim(&mut self, sim_id: SimId, new_rom: Option<Vec<u8>>) -> Result<()> {
|
||||
let index = sim_id.to_index();
|
||||
while self.sims.len() <= index {
|
||||
self.sims.push(Sim::new());
|
||||
self.sim_state[index].store(SimState::NoGame, Ordering::Release);
|
||||
}
|
||||
self.sim_count.store(self.sims.len(), Ordering::Relaxed);
|
||||
let sim = &mut self.sims[index];
|
||||
sim.reset();
|
||||
if let Some(cart) = new_cart {
|
||||
sim.load_cart(cart.rom.clone(), cart.sram.clone())?;
|
||||
self.carts[index] = Some(cart);
|
||||
self.sim_state[index].store(SimState::Ready, Ordering::Release);
|
||||
if let Some(bytes) = new_rom {
|
||||
sim.load_rom(bytes)?;
|
||||
self.has_game[index].store(true, Ordering::Release);
|
||||
}
|
||||
if self.sim_state[index].load(Ordering::Acquire) == SimState::Ready {
|
||||
self.resume_sims();
|
||||
if self.has_game[index].load(Ordering::Acquire) {
|
||||
self.running[index].store(true, Ordering::Release);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
|
@ -256,120 +179,66 @@ impl Emulator {
|
|||
self.linked.store(false, Ordering::Release);
|
||||
}
|
||||
|
||||
fn pause_sims(&mut self) -> Result<()> {
|
||||
if self
|
||||
.state
|
||||
.compare_exchange(
|
||||
EmulatorState::Running,
|
||||
EmulatorState::Paused,
|
||||
Ordering::AcqRel,
|
||||
Ordering::Relaxed,
|
||||
)
|
||||
.is_ok()
|
||||
{
|
||||
for sim_id in SimId::values() {
|
||||
self.save_sram(sim_id)?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn resume_sims(&mut self) {
|
||||
let _ = self.state.compare_exchange(
|
||||
EmulatorState::Paused,
|
||||
EmulatorState::Running,
|
||||
Ordering::AcqRel,
|
||||
Ordering::Relaxed,
|
||||
);
|
||||
}
|
||||
|
||||
fn save_sram(&mut self, sim_id: SimId) -> Result<()> {
|
||||
let sim = self.sims.get_mut(sim_id.to_index());
|
||||
let cart = self.carts[sim_id.to_index()].as_mut();
|
||||
if let (Some(sim), Some(cart)) = (sim, cart) {
|
||||
sim.read_sram(&mut cart.sram);
|
||||
cart.sram_file.seek(SeekFrom::Start(0))?;
|
||||
cart.sram_file.write_all(&cart.sram)?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn stop_second_sim(&mut self) -> Result<()> {
|
||||
self.save_sram(SimId::Player2)?;
|
||||
pub fn stop_second_sim(&mut self) {
|
||||
self.renderers.remove(&SimId::Player2);
|
||||
self.sims.truncate(1);
|
||||
self.sim_state[SimId::Player2.to_index()].store(SimState::Uninitialized, Ordering::Release);
|
||||
self.stop_debugging(SimId::Player2);
|
||||
self.sim_count.store(self.sims.len(), Ordering::Relaxed);
|
||||
self.running[SimId::Player2.to_index()].store(false, Ordering::Release);
|
||||
self.has_game[SimId::Player2.to_index()].store(false, Ordering::Release);
|
||||
self.linked.store(false, Ordering::Release);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn start_debugging(&mut self, sim_id: SimId, sender: DebugSender) {
|
||||
if self.sim_state[sim_id.to_index()].load(Ordering::Acquire) != SimState::Ready {
|
||||
// Can't debug unless a game is connected
|
||||
return;
|
||||
}
|
||||
let debug = DebugInfo {
|
||||
sender,
|
||||
stop_reason: Some(DebugStopReason::Paused),
|
||||
};
|
||||
self.debuggers.insert(sim_id, debug);
|
||||
self.state
|
||||
.store(EmulatorState::Debugging, Ordering::Release);
|
||||
}
|
||||
|
||||
fn stop_debugging(&mut self, sim_id: SimId) {
|
||||
if let Some(sim) = self.sims.get_mut(sim_id.to_index()) {
|
||||
sim.clear_debug_state();
|
||||
}
|
||||
self.debuggers.remove(&sim_id);
|
||||
if self.debuggers.is_empty() {
|
||||
let _ = self.state.compare_exchange(
|
||||
EmulatorState::Debugging,
|
||||
EmulatorState::Running,
|
||||
Ordering::AcqRel,
|
||||
Ordering::Relaxed,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
fn debug_interrupt(&mut self, sim_id: SimId) {
|
||||
self.debug_stop(sim_id, DebugStopReason::Paused);
|
||||
}
|
||||
|
||||
fn debug_stop(&mut self, sim_id: SimId, reason: DebugStopReason) {
|
||||
let Some(debugger) = self.debuggers.get_mut(&sim_id) else {
|
||||
self.stop_debugging(sim_id);
|
||||
return;
|
||||
};
|
||||
if debugger.stop_reason != Some(reason) {
|
||||
debugger.stop_reason = Some(reason);
|
||||
if debugger.sender.send(DebugEvent::Stopped(reason)).is_err() {
|
||||
self.stop_debugging(sim_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn debug_continue(&mut self, sim_id: SimId) -> bool {
|
||||
let Some(debugger) = self.debuggers.get_mut(&sim_id) else {
|
||||
self.stop_debugging(sim_id);
|
||||
return false;
|
||||
};
|
||||
debugger.stop_reason = None;
|
||||
true
|
||||
}
|
||||
fn debug_step(&mut self, sim_id: SimId) {
|
||||
if self.debug_continue(sim_id) {
|
||||
let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
|
||||
return;
|
||||
};
|
||||
sim.step();
|
||||
}
|
||||
}
|
||||
|
||||
pub fn run(&mut self) {
|
||||
let mut eye_contents = vec![0u8; 384 * 224 * 2];
|
||||
let mut audio_samples = vec![];
|
||||
loop {
|
||||
let idle = self.tick();
|
||||
let p1_running = self.running[SimId::Player1.to_index()].load(Ordering::Acquire);
|
||||
let p2_running = self.running[SimId::Player2.to_index()].load(Ordering::Acquire);
|
||||
let mut idle = p1_running || p2_running;
|
||||
if p1_running && p2_running {
|
||||
Sim::emulate_many(&mut self.sims);
|
||||
} else if p1_running {
|
||||
self.sims[SimId::Player1.to_index()].emulate();
|
||||
} else if p2_running {
|
||||
self.sims[SimId::Player2.to_index()].emulate();
|
||||
}
|
||||
|
||||
for sim_id in SimId::values() {
|
||||
let Some(renderer) = self.renderers.get_mut(&sim_id) else {
|
||||
continue;
|
||||
};
|
||||
let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
|
||||
continue;
|
||||
};
|
||||
if sim.read_pixels(&mut eye_contents) {
|
||||
idle = false;
|
||||
if renderer.queue_render(&eye_contents).is_err() {
|
||||
self.renderers.remove(&sim_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
let p1_audio =
|
||||
p1_running && self.audio_on[SimId::Player1.to_index()].load(Ordering::Acquire);
|
||||
let p2_audio =
|
||||
p2_running && self.audio_on[SimId::Player2.to_index()].load(Ordering::Acquire);
|
||||
let weight = if p1_audio && p2_audio { 0.5 } else { 1.0 };
|
||||
if p1_audio {
|
||||
if let Some(sim) = self.sims.get_mut(SimId::Player1.to_index()) {
|
||||
sim.read_samples(&mut audio_samples, weight);
|
||||
}
|
||||
}
|
||||
if p2_audio {
|
||||
if let Some(sim) = self.sims.get_mut(SimId::Player2.to_index()) {
|
||||
sim.read_samples(&mut audio_samples, weight);
|
||||
}
|
||||
}
|
||||
if audio_samples.is_empty() {
|
||||
audio_samples.resize(EXPECTED_FRAME_SIZE, 0.0);
|
||||
} else {
|
||||
idle = false;
|
||||
}
|
||||
self.audio.update(&audio_samples);
|
||||
audio_samples.clear();
|
||||
if idle {
|
||||
// The game is paused, and we have output all the video/audio we have.
|
||||
// Block the thread until a new command comes in.
|
||||
|
|
@ -394,192 +263,36 @@ impl Emulator {
|
|||
}
|
||||
}
|
||||
|
||||
// returns true if the emulator is "idle" (i.e. this didn't output anything)
|
||||
pub fn tick(&mut self) -> bool {
|
||||
let p1_state = self.sim_state[SimId::Player1.to_index()].load(Ordering::Acquire);
|
||||
let p2_state = self.sim_state[SimId::Player2.to_index()].load(Ordering::Acquire);
|
||||
let state = self.state.load(Ordering::Acquire);
|
||||
|
||||
// Emulation
|
||||
// Don't emulate if the state is "paused", or if any sim is paused in the debugger
|
||||
let running = match state {
|
||||
EmulatorState::Paused => false,
|
||||
EmulatorState::Running => true,
|
||||
EmulatorState::Debugging => self.debuggers.values().all(|d| d.stop_reason.is_none()),
|
||||
};
|
||||
let p1_running = running && p1_state == SimState::Ready;
|
||||
let p2_running = running && p2_state == SimState::Ready;
|
||||
let mut idle = !p1_running && !p2_running;
|
||||
if p1_running && p2_running {
|
||||
Sim::emulate_many(&mut self.sims);
|
||||
} else if p1_running {
|
||||
self.sims[SimId::Player1.to_index()].emulate();
|
||||
} else if p2_running {
|
||||
self.sims[SimId::Player2.to_index()].emulate();
|
||||
}
|
||||
|
||||
// Debug state
|
||||
if state == EmulatorState::Debugging {
|
||||
for sim_id in SimId::values() {
|
||||
let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
|
||||
continue;
|
||||
};
|
||||
if let Some(reason) = sim.stop_reason() {
|
||||
let stop_reason = match reason {
|
||||
StopReason::Stepped => DebugStopReason::Trace,
|
||||
StopReason::Watchpoint(watch, address) => {
|
||||
DebugStopReason::Watchpoint(watch, address)
|
||||
}
|
||||
StopReason::Breakpoint => DebugStopReason::Breakpoint,
|
||||
};
|
||||
self.debug_stop(sim_id, stop_reason);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Video
|
||||
for sim_id in SimId::values() {
|
||||
let Some(renderer) = self.renderers.get_mut(&sim_id) else {
|
||||
continue;
|
||||
};
|
||||
let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
|
||||
continue;
|
||||
};
|
||||
if sim.read_pixels(&mut self.eye_contents) {
|
||||
idle = false;
|
||||
if renderer.queue_render(&self.eye_contents).is_err() {
|
||||
self.renderers.remove(&sim_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Audio
|
||||
// Audio playback speed is how we keep the emulator running in real time.
|
||||
// Even if we're muted, call `read_samples` to know how many frames of silence to play.
|
||||
let p1_audio =
|
||||
p1_running && self.audio_on[SimId::Player1.to_index()].load(Ordering::Acquire);
|
||||
let p2_audio =
|
||||
p2_running && self.audio_on[SimId::Player2.to_index()].load(Ordering::Acquire);
|
||||
let (p1_weight, p2_weight) = match (p1_audio, p2_audio) {
|
||||
(true, true) => (0.5, 0.5),
|
||||
(true, false) => (1.0, 0.0),
|
||||
(false, true) => (0.0, 1.0),
|
||||
(false, false) => (0.0, 0.0),
|
||||
};
|
||||
if let Some(sim) = self.sims.get_mut(SimId::Player1.to_index()) {
|
||||
sim.read_samples(&mut self.audio_samples, p1_weight);
|
||||
}
|
||||
if let Some(sim) = self.sims.get_mut(SimId::Player2.to_index()) {
|
||||
sim.read_samples(&mut self.audio_samples, p2_weight);
|
||||
}
|
||||
if !self.audio_samples.is_empty() {
|
||||
idle = false;
|
||||
}
|
||||
self.audio.update(&self.audio_samples);
|
||||
self.audio_samples.clear();
|
||||
idle
|
||||
}
|
||||
|
||||
fn handle_command(&mut self, command: EmulatorCommand) {
|
||||
match command {
|
||||
EmulatorCommand::ConnectToSim(sim_id, renderer, messages) => {
|
||||
EmulatorCommand::SetRenderer(sim_id, renderer) => {
|
||||
self.renderers.insert(sim_id, renderer);
|
||||
self.messages.insert(sim_id, messages);
|
||||
}
|
||||
EmulatorCommand::LoadGame(sim_id, path) => {
|
||||
if let Err(error) = self.load_cart(sim_id, &path) {
|
||||
self.report_error(sim_id, format!("Error loading rom: {error}"));
|
||||
if let Err(error) = self.load_rom(sim_id, &path) {
|
||||
eprintln!("error loading rom: {}", error);
|
||||
}
|
||||
}
|
||||
EmulatorCommand::StartSecondSim(path) => {
|
||||
if let Err(error) = self.start_second_sim(path) {
|
||||
self.report_error(
|
||||
SimId::Player2,
|
||||
format!("Error starting second sim: {error}"),
|
||||
);
|
||||
eprintln!("error starting second sim: {}", error);
|
||||
}
|
||||
}
|
||||
EmulatorCommand::StopSecondSim => {
|
||||
if let Err(error) = self.stop_second_sim() {
|
||||
self.report_error(
|
||||
SimId::Player2,
|
||||
format!("Error stopping second sim: {error}"),
|
||||
);
|
||||
}
|
||||
self.stop_second_sim();
|
||||
}
|
||||
EmulatorCommand::Pause => {
|
||||
if let Err(error) = self.pause_sims() {
|
||||
self.report_error(SimId::Player1, format!("Error pausing: {error}"));
|
||||
for sim in SimId::values() {
|
||||
self.running[sim.to_index()].store(false, Ordering::Release);
|
||||
}
|
||||
}
|
||||
EmulatorCommand::Resume => {
|
||||
self.resume_sims();
|
||||
}
|
||||
EmulatorCommand::StartDebugging(sim_id, debugger) => {
|
||||
self.start_debugging(sim_id, debugger);
|
||||
}
|
||||
EmulatorCommand::StopDebugging(sim_id) => {
|
||||
self.stop_debugging(sim_id);
|
||||
}
|
||||
EmulatorCommand::DebugInterrupt(sim_id) => {
|
||||
self.debug_interrupt(sim_id);
|
||||
}
|
||||
EmulatorCommand::DebugContinue(sim_id) => {
|
||||
self.debug_continue(sim_id);
|
||||
}
|
||||
EmulatorCommand::DebugStep(sim_id) => {
|
||||
self.debug_step(sim_id);
|
||||
}
|
||||
EmulatorCommand::ReadRegister(sim_id, register, done) => {
|
||||
let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
|
||||
return;
|
||||
};
|
||||
let value = sim.read_register(register);
|
||||
let _ = done.send(value);
|
||||
}
|
||||
EmulatorCommand::WriteRegister(sim_id, register, value) => {
|
||||
let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
|
||||
return;
|
||||
};
|
||||
sim.write_register(register, value);
|
||||
}
|
||||
EmulatorCommand::ReadMemory(sim_id, start, length, mut buffer, done) => {
|
||||
let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
|
||||
return;
|
||||
};
|
||||
sim.read_memory(start, length, &mut buffer);
|
||||
let _ = done.send(buffer);
|
||||
}
|
||||
EmulatorCommand::WriteMemory(sim_id, start, buffer, done) => {
|
||||
let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
|
||||
return;
|
||||
};
|
||||
sim.write_memory(start, &buffer);
|
||||
let _ = done.send(buffer);
|
||||
}
|
||||
EmulatorCommand::AddBreakpoint(sim_id, address) => {
|
||||
let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
|
||||
return;
|
||||
};
|
||||
sim.add_breakpoint(address);
|
||||
}
|
||||
EmulatorCommand::RemoveBreakpoint(sim_id, address) => {
|
||||
let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
|
||||
return;
|
||||
};
|
||||
sim.remove_breakpoint(address);
|
||||
}
|
||||
EmulatorCommand::AddWatchpoint(sim_id, address, length, watch) => {
|
||||
let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
|
||||
return;
|
||||
};
|
||||
sim.add_watchpoint(address, length, watch);
|
||||
}
|
||||
EmulatorCommand::RemoveWatchpoint(sim_id, address, length, watch) => {
|
||||
let Some(sim) = self.sims.get_mut(sim_id.to_index()) else {
|
||||
return;
|
||||
};
|
||||
sim.remove_watchpoint(address, length, watch);
|
||||
for sim_id in SimId::values() {
|
||||
let index = sim_id.to_index();
|
||||
if self.has_game[index].load(Ordering::Acquire) {
|
||||
self.running[index].store(true, Ordering::Relaxed);
|
||||
}
|
||||
}
|
||||
}
|
||||
EmulatorCommand::SetAudioEnabled(p1, p2) => {
|
||||
self.audio_on[SimId::Player1.to_index()].store(p1, Ordering::Release);
|
||||
|
|
@ -593,7 +306,7 @@ impl Emulator {
|
|||
}
|
||||
EmulatorCommand::Reset(sim_id) => {
|
||||
if let Err(error) = self.reset_sim(sim_id, None) {
|
||||
self.report_error(sim_id, format!("Error resetting sim: {error}"));
|
||||
eprintln!("error resetting sim: {}", error);
|
||||
}
|
||||
}
|
||||
EmulatorCommand::SetKeys(sim_id, keys) => {
|
||||
|
|
@ -601,135 +314,57 @@ impl Emulator {
|
|||
sim.set_keys(keys);
|
||||
}
|
||||
}
|
||||
EmulatorCommand::Exit(done) => {
|
||||
for sim_id in SimId::values() {
|
||||
if let Err(error) = self.save_sram(sim_id) {
|
||||
self.report_error(sim_id, format!("Error saving sram on exit: {error}"));
|
||||
}
|
||||
}
|
||||
let _ = done.send(());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn report_error(&self, sim_id: SimId, message: String) {
|
||||
let messages = self
|
||||
.messages
|
||||
.get(&sim_id)
|
||||
.or_else(|| self.messages.get(&SimId::Player1));
|
||||
if let Some(msg) = messages {
|
||||
let toast = Toast::new()
|
||||
.kind(ToastKind::Error)
|
||||
.options(ToastOptions::default().duration_in_seconds(5.0))
|
||||
.text(&message);
|
||||
if msg.send(toast).is_ok() {
|
||||
return;
|
||||
}
|
||||
}
|
||||
error!("{}", message);
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum EmulatorCommand {
|
||||
ConnectToSim(SimId, TextureSink, mpsc::Sender<Toast>),
|
||||
SetRenderer(SimId, TextureSink),
|
||||
LoadGame(SimId, PathBuf),
|
||||
StartSecondSim(Option<PathBuf>),
|
||||
StopSecondSim,
|
||||
Pause,
|
||||
Resume,
|
||||
StartDebugging(SimId, DebugSender),
|
||||
StopDebugging(SimId),
|
||||
DebugInterrupt(SimId),
|
||||
DebugContinue(SimId),
|
||||
DebugStep(SimId),
|
||||
ReadRegister(SimId, VBRegister, oneshot::Sender<u32>),
|
||||
WriteRegister(SimId, VBRegister, u32),
|
||||
ReadMemory(SimId, u32, usize, Vec<u8>, oneshot::Sender<Vec<u8>>),
|
||||
WriteMemory(SimId, u32, Vec<u8>, oneshot::Sender<Vec<u8>>),
|
||||
AddBreakpoint(SimId, u32),
|
||||
RemoveBreakpoint(SimId, u32),
|
||||
AddWatchpoint(SimId, u32, usize, VBWatchpointType),
|
||||
RemoveWatchpoint(SimId, u32, usize, VBWatchpointType),
|
||||
SetAudioEnabled(bool, bool),
|
||||
Link,
|
||||
Unlink,
|
||||
Reset(SimId),
|
||||
SetKeys(SimId, VBKey),
|
||||
Exit(oneshot::Sender<()>),
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, NoUninit)]
|
||||
#[repr(usize)]
|
||||
pub enum SimState {
|
||||
Uninitialized,
|
||||
NoGame,
|
||||
Ready,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, NoUninit)]
|
||||
#[repr(usize)]
|
||||
pub enum EmulatorState {
|
||||
Paused,
|
||||
Running,
|
||||
Debugging,
|
||||
}
|
||||
|
||||
type DebugSender = tokio::sync::mpsc::UnboundedSender<DebugEvent>;
|
||||
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub enum DebugStopReason {
|
||||
// We are stepping
|
||||
Trace,
|
||||
// We hit a breakpoint
|
||||
Breakpoint,
|
||||
// We hit a watchpoint
|
||||
Watchpoint(VBWatchpointType, u32),
|
||||
// The debugger told us to pause
|
||||
Paused,
|
||||
}
|
||||
|
||||
struct DebugInfo {
|
||||
sender: DebugSender,
|
||||
stop_reason: Option<DebugStopReason>,
|
||||
}
|
||||
|
||||
pub enum DebugEvent {
|
||||
Stopped(DebugStopReason),
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct EmulatorClient {
|
||||
queue: mpsc::Sender<EmulatorCommand>,
|
||||
sim_state: Arc<[Atomic<SimState>; 2]>,
|
||||
state: Arc<Atomic<EmulatorState>>,
|
||||
sim_count: Arc<AtomicUsize>,
|
||||
running: Arc<[AtomicBool; 2]>,
|
||||
has_game: Arc<[AtomicBool; 2]>,
|
||||
audio_on: Arc<[AtomicBool; 2]>,
|
||||
linked: Arc<AtomicBool>,
|
||||
}
|
||||
|
||||
impl EmulatorClient {
|
||||
pub fn sim_state(&self, sim_id: SimId) -> SimState {
|
||||
self.sim_state[sim_id.to_index()].load(Ordering::Acquire)
|
||||
pub fn has_player_2(&self) -> bool {
|
||||
self.sim_count.load(Ordering::Acquire) == 2
|
||||
}
|
||||
pub fn emulator_state(&self) -> EmulatorState {
|
||||
self.state.load(Ordering::Acquire)
|
||||
pub fn is_running(&self, sim_id: SimId) -> bool {
|
||||
self.running[sim_id.to_index()].load(Ordering::Acquire)
|
||||
}
|
||||
pub fn is_audio_enabled(&self, sim_id: SimId) -> bool {
|
||||
self.audio_on[sim_id.to_index()].load(Ordering::Acquire)
|
||||
pub fn has_game(&self, sim_id: SimId) -> bool {
|
||||
self.has_game[sim_id.to_index()].load(Ordering::Acquire)
|
||||
}
|
||||
pub fn are_sims_linked(&self) -> bool {
|
||||
self.linked.load(Ordering::Acquire)
|
||||
}
|
||||
pub fn send_command(&self, command: EmulatorCommand) -> bool {
|
||||
match self.queue.send(command) {
|
||||
Ok(()) => true,
|
||||
Err(err) => {
|
||||
warn!(
|
||||
"could not send command {:?} as emulator is shut down",
|
||||
err.0
|
||||
);
|
||||
false
|
||||
}
|
||||
pub fn is_audio_enabled(&self, sim_id: SimId) -> bool {
|
||||
self.audio_on[sim_id.to_index()].load(Ordering::Acquire)
|
||||
}
|
||||
pub fn send_command(&self, command: EmulatorCommand) {
|
||||
if let Err(err) = self.queue.send(command) {
|
||||
eprintln!(
|
||||
"could not send command {:?} as emulator is shut down",
|
||||
err.0
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,270 +0,0 @@
|
|||
use std::{
|
||||
collections::{BTreeMap, BTreeSet},
|
||||
ops::Bound,
|
||||
};
|
||||
|
||||
#[derive(Debug, Default)]
|
||||
pub struct AddressSet {
|
||||
ranges: BTreeSet<(u32, usize)>,
|
||||
bounds: BTreeMap<u32, usize>,
|
||||
}
|
||||
|
||||
impl AddressSet {
|
||||
pub fn new() -> Self {
|
||||
Self::default()
|
||||
}
|
||||
|
||||
pub fn add(&mut self, address: u32, length: usize) {
|
||||
if length == 0 || !self.ranges.insert((address, length)) {
|
||||
return;
|
||||
}
|
||||
let end = (address as usize)
|
||||
.checked_add(length)
|
||||
.and_then(|e| u32::try_from(e).ok());
|
||||
|
||||
if let Some(end) = end {
|
||||
let val_before = self.bounds.range(..=end).next_back().map_or(0, |(_, &v)| v);
|
||||
self.bounds.insert(end, val_before);
|
||||
}
|
||||
|
||||
let val_before = self
|
||||
.bounds
|
||||
.range(..address)
|
||||
.next_back()
|
||||
.map_or(0, |(_, &v)| v);
|
||||
if let Some(&val_at) = self.bounds.get(&address) {
|
||||
if val_before == val_at + 1 {
|
||||
self.bounds.remove(&address);
|
||||
}
|
||||
} else {
|
||||
self.bounds.insert(address, val_before);
|
||||
}
|
||||
|
||||
let start_bound = Bound::Included(address);
|
||||
let end_bound = match end {
|
||||
Some(e) => Bound::Excluded(e),
|
||||
None => Bound::Unbounded,
|
||||
};
|
||||
|
||||
for (_, val) in self.bounds.range_mut((start_bound, end_bound)) {
|
||||
*val += 1;
|
||||
}
|
||||
}
|
||||
|
||||
pub fn remove(&mut self, address: u32, length: usize) {
|
||||
if !self.ranges.remove(&(address, length)) {
|
||||
return;
|
||||
}
|
||||
let end = (address as usize)
|
||||
.checked_add(length)
|
||||
.and_then(|e| u32::try_from(e).ok());
|
||||
|
||||
if let Some(end) = end {
|
||||
let val_before = self.bounds.range(..end).next_back().map_or(0, |(_, &v)| v);
|
||||
if let Some(&val_at) = self.bounds.get(&end) {
|
||||
if val_at + 1 == val_before {
|
||||
self.bounds.remove(&end);
|
||||
}
|
||||
} else {
|
||||
self.bounds.insert(end, val_before);
|
||||
}
|
||||
}
|
||||
|
||||
let val_before = self
|
||||
.bounds
|
||||
.range(..address)
|
||||
.next_back()
|
||||
.map_or(0, |(_, &v)| v);
|
||||
if let Some(&val_at) = self.bounds.get(&address) {
|
||||
if val_before + 1 == val_at {
|
||||
self.bounds.remove(&address);
|
||||
}
|
||||
} else {
|
||||
self.bounds.insert(address, val_before);
|
||||
}
|
||||
|
||||
let start_bound = Bound::Included(address);
|
||||
let end_bound = match end {
|
||||
Some(e) => Bound::Excluded(e),
|
||||
None => Bound::Unbounded,
|
||||
};
|
||||
|
||||
for (_, val) in self.bounds.range_mut((start_bound, end_bound)) {
|
||||
*val -= 1;
|
||||
}
|
||||
}
|
||||
|
||||
pub fn clear(&mut self) {
|
||||
self.ranges.clear();
|
||||
self.bounds.clear();
|
||||
}
|
||||
|
||||
pub fn is_empty(&self) -> bool {
|
||||
self.bounds.is_empty()
|
||||
}
|
||||
|
||||
pub fn contains(&self, address: u32) -> bool {
|
||||
self.bounds
|
||||
.range(..=address)
|
||||
.next_back()
|
||||
.is_some_and(|(_, &val)| val > 0)
|
||||
}
|
||||
|
||||
pub fn start_of_range_containing(&self, address: u32) -> Option<u32> {
|
||||
if !self.contains(address) {
|
||||
return None;
|
||||
}
|
||||
self.ranges
|
||||
.range(..=(address, usize::MAX))
|
||||
.rev()
|
||||
.find_map(|&(start, length)| {
|
||||
let contains = start <= address
|
||||
&& (start as usize)
|
||||
.checked_add(length)
|
||||
.is_none_or(|end| end > address as usize);
|
||||
contains.then_some(start)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::AddressSet;
|
||||
|
||||
#[test]
|
||||
fn should_not_include_addresses_when_empty() {
|
||||
let set = AddressSet::new();
|
||||
assert!(set.is_empty());
|
||||
assert!(!set.contains(0x13374200));
|
||||
assert_eq!(set.start_of_range_containing(0x13374200), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn should_include_addresses_when_full() {
|
||||
let mut set = AddressSet::new();
|
||||
set.add(0x00000000, 0x100000000);
|
||||
assert!(set.contains(0x13374200));
|
||||
assert_eq!(set.start_of_range_containing(0x13374200), Some(0x00000000));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn should_ignore_empty_address_ranges() {
|
||||
let mut set = AddressSet::new();
|
||||
set.add(0x13374200, 0);
|
||||
assert!(set.is_empty());
|
||||
assert!(!set.contains(0x13374200));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn should_add_addresses_idempotently() {
|
||||
let mut set = AddressSet::new();
|
||||
set.add(0x13374200, 1);
|
||||
set.add(0x13374200, 1);
|
||||
set.remove(0x13374200, 1);
|
||||
assert!(set.is_empty());
|
||||
assert!(!set.contains(0x13374200));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn should_remove_addresses_idempotently() {
|
||||
let mut set = AddressSet::new();
|
||||
set.add(0x13374200, 1);
|
||||
set.remove(0x13374200, 1);
|
||||
set.remove(0x13374200, 1);
|
||||
assert!(set.is_empty());
|
||||
assert!(!set.contains(0x13374200));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn should_report_address_in_range() {
|
||||
let mut set = AddressSet::new();
|
||||
set.add(0x13374200, 4);
|
||||
assert!(!set.contains(0x133741ff));
|
||||
for address in 0x13374200..0x13374204 {
|
||||
assert!(set.contains(address));
|
||||
}
|
||||
assert!(!set.contains(0x13374204));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn should_allow_overlapping_addresses() {
|
||||
let mut set = AddressSet::new();
|
||||
set.add(0x13374200, 4);
|
||||
set.add(0x13374201, 1);
|
||||
set.add(0x13374202, 2);
|
||||
|
||||
assert!(!set.contains(0x133741ff));
|
||||
for address in 0x13374200..0x13374204 {
|
||||
assert!(set.contains(address));
|
||||
}
|
||||
assert!(!set.contains(0x13374204));
|
||||
|
||||
set.remove(0x13374200, 4);
|
||||
assert!(!set.contains(0x13374200));
|
||||
for address in 0x13374201..0x13374204 {
|
||||
assert!(set.contains(address));
|
||||
}
|
||||
assert!(!set.contains(0x13374204));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn should_allow_removing_overlapped_address_ranges() {
|
||||
let mut set = AddressSet::new();
|
||||
set.add(0x13374200, 8);
|
||||
set.add(0x13374204, 8);
|
||||
set.remove(0x13374204, 8);
|
||||
|
||||
for address in 0x13374200..0x13374208 {
|
||||
assert!(set.contains(address));
|
||||
}
|
||||
for address in 0x13374208..0x1337420c {
|
||||
assert!(!set.contains(address));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn should_merge_adjacent_ranges() {
|
||||
let mut set = AddressSet::new();
|
||||
set.add(0x13374200, 4);
|
||||
set.add(0x13374204, 4);
|
||||
set.add(0x13374208, 4);
|
||||
set.add(0x1337420c, 4);
|
||||
|
||||
assert!(!set.contains(0x133741ff));
|
||||
for address in 0x13374200..0x13374210 {
|
||||
assert!(set.contains(address));
|
||||
}
|
||||
assert!(!set.contains(0x13374210));
|
||||
|
||||
set.remove(0x13374200, 4);
|
||||
set.remove(0x13374204, 4);
|
||||
set.remove(0x13374208, 4);
|
||||
set.remove(0x1337420c, 4);
|
||||
|
||||
assert!(set.is_empty());
|
||||
for address in 0x133741ff..=0x13374210 {
|
||||
assert!(!set.contains(address));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn should_find_start_of_range() {
|
||||
let mut set = AddressSet::new();
|
||||
set.add(0x13374200, 4);
|
||||
assert_eq!(set.start_of_range_containing(0x133741ff), None);
|
||||
for address in 0x13374200..0x13374204 {
|
||||
assert_eq!(set.start_of_range_containing(address), Some(0x13374200));
|
||||
}
|
||||
assert_eq!(set.start_of_range_containing(0x13374204), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn should_ignore_ranges_not_containing_address() {
|
||||
let mut set = AddressSet::new();
|
||||
set.add(0x10000000, 1024);
|
||||
set.add(0x30000000, 1024);
|
||||
|
||||
assert!(!set.contains(0x20000000));
|
||||
assert_eq!(set.start_of_range_containing(0x20000000), None);
|
||||
}
|
||||
}
|
||||
|
|
@ -3,9 +3,6 @@ use std::{ffi::c_void, ptr, slice};
|
|||
use anyhow::{anyhow, Result};
|
||||
use bitflags::bitflags;
|
||||
use num_derive::{FromPrimitive, ToPrimitive};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use super::address_set::AddressSet;
|
||||
|
||||
#[repr(C)]
|
||||
struct VB {
|
||||
|
|
@ -36,7 +33,7 @@ enum VBOption {
|
|||
|
||||
bitflags! {
|
||||
#[repr(transparent)]
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
|
||||
pub struct VBKey: u16 {
|
||||
const PWR = 0x0001;
|
||||
const SGN = 0x0002;
|
||||
|
|
@ -57,38 +54,7 @@ bitflags! {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug)]
|
||||
pub enum VBRegister {
|
||||
Program(u32),
|
||||
System(u32),
|
||||
PC,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub enum VBWatchpointType {
|
||||
Read,
|
||||
Write,
|
||||
Access,
|
||||
}
|
||||
|
||||
type OnExecute =
|
||||
extern "C" fn(sim: *mut VB, address: u32, code: *const u16, length: c_int) -> c_int;
|
||||
type OnFrame = extern "C" fn(sim: *mut VB) -> c_int;
|
||||
type OnRead = extern "C" fn(
|
||||
sim: *mut VB,
|
||||
address: u32,
|
||||
type_: VBDataType,
|
||||
value: *mut i32,
|
||||
cycles: *mut u32,
|
||||
) -> c_int;
|
||||
type OnWrite = extern "C" fn(
|
||||
sim: *mut VB,
|
||||
address: u32,
|
||||
type_: VBDataType,
|
||||
value: *mut i32,
|
||||
cycles: *mut u32,
|
||||
cancel: *mut c_int,
|
||||
) -> c_int;
|
||||
|
||||
#[link(name = "vb")]
|
||||
extern "C" {
|
||||
|
|
@ -96,8 +62,6 @@ extern "C" {
|
|||
fn vb_emulate(sim: *mut VB, cycles: *mut u32) -> c_int;
|
||||
#[link_name = "vbEmulateEx"]
|
||||
fn vb_emulate_ex(sims: *mut *mut VB, count: c_uint, cycles: *mut u32) -> c_int;
|
||||
#[link_name = "vbGetCartRAM"]
|
||||
fn vb_get_cart_ram(sim: *mut VB, size: *mut u32) -> *mut c_void;
|
||||
#[link_name = "vbGetCartROM"]
|
||||
fn vb_get_cart_rom(sim: *mut VB, size: *mut u32) -> *mut c_void;
|
||||
#[link_name = "vbGetPixels"]
|
||||
|
|
@ -110,10 +74,6 @@ extern "C" {
|
|||
right_stride_x: c_int,
|
||||
right_stride_y: c_int,
|
||||
);
|
||||
#[link_name = "vbGetProgramCounter"]
|
||||
fn vb_get_program_counter(sim: *mut VB) -> u32;
|
||||
#[link_name = "vbGetProgramRegister"]
|
||||
fn vb_get_program_register(sim: *mut VB, index: c_uint) -> i32;
|
||||
#[link_name = "vbGetSamples"]
|
||||
fn vb_get_samples(
|
||||
sim: *mut VB,
|
||||
|
|
@ -121,36 +81,22 @@ extern "C" {
|
|||
capacity: *mut c_uint,
|
||||
position: *mut c_uint,
|
||||
) -> *mut c_void;
|
||||
#[link_name = "vbGetSystemRegister"]
|
||||
fn vb_get_system_register(sim: *mut VB, index: c_uint) -> i32;
|
||||
#[link_name = "vbGetUserData"]
|
||||
fn vb_get_user_data(sim: *mut VB) -> *mut c_void;
|
||||
#[link_name = "vbInit"]
|
||||
fn vb_init(sim: *mut VB) -> *mut VB;
|
||||
#[link_name = "vbRead"]
|
||||
fn vb_read(sim: *mut VB, address: u32, typ_: VBDataType) -> i32;
|
||||
#[link_name = "vbReset"]
|
||||
fn vb_reset(sim: *mut VB);
|
||||
#[link_name = "vbSetCartRAM"]
|
||||
fn vb_set_cart_ram(sim: *mut VB, sram: *mut c_void, size: u32) -> c_int;
|
||||
#[link_name = "vbSetCartROM"]
|
||||
fn vb_set_cart_rom(sim: *mut VB, rom: *mut c_void, size: u32) -> c_int;
|
||||
#[link_name = "vbSetExecuteCallback"]
|
||||
fn vb_set_execute_callback(sim: *mut VB, callback: Option<OnExecute>) -> Option<OnExecute>;
|
||||
#[link_name = "vbSetFrameCallback"]
|
||||
fn vb_set_frame_callback(sim: *mut VB, callback: Option<OnFrame>) -> Option<OnFrame>;
|
||||
fn vb_set_frame_callback(sim: *mut VB, on_frame: OnFrame);
|
||||
#[link_name = "vbSetKeys"]
|
||||
fn vb_set_keys(sim: *mut VB, keys: u16) -> u16;
|
||||
#[link_name = "vbSetOption"]
|
||||
fn vb_set_option(sim: *mut VB, key: VBOption, value: c_int);
|
||||
#[link_name = "vbSetPeer"]
|
||||
fn vb_set_peer(sim: *mut VB, peer: *mut VB);
|
||||
#[link_name = "vbSetProgramCounter"]
|
||||
fn vb_set_program_counter(sim: *mut VB, value: u32) -> u32;
|
||||
#[link_name = "vbSetProgramRegister"]
|
||||
fn vb_set_program_register(sim: *mut VB, index: c_uint, value: i32) -> i32;
|
||||
#[link_name = "vbSetReadCallback"]
|
||||
fn vb_set_read_callback(sim: *mut VB, callback: Option<OnRead>) -> Option<OnRead>;
|
||||
#[link_name = "vbSetSamples"]
|
||||
fn vb_set_samples(
|
||||
sim: *mut VB,
|
||||
|
|
@ -158,20 +104,13 @@ extern "C" {
|
|||
typ_: VBDataType,
|
||||
capacity: c_uint,
|
||||
) -> c_int;
|
||||
#[link_name = "vbSetSystemRegister"]
|
||||
fn vb_set_system_register(sim: *mut VB, index: c_uint, value: u32) -> u32;
|
||||
#[link_name = "vbSetUserData"]
|
||||
fn vb_set_user_data(sim: *mut VB, tag: *mut c_void);
|
||||
#[link_name = "vbSetWriteCallback"]
|
||||
fn vb_set_write_callback(sim: *mut VB, callback: Option<OnWrite>) -> Option<OnWrite>;
|
||||
#[link_name = "vbSizeOf"]
|
||||
fn vb_size_of() -> usize;
|
||||
#[link_name = "vbWrite"]
|
||||
fn vb_write(sim: *mut VB, address: u32, _type: VBDataType, value: i32) -> i32;
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
extern "C" fn on_frame(sim: *mut VB) -> c_int {
|
||||
extern "C" fn on_frame(sim: *mut VB) -> i32 {
|
||||
// SAFETY: the *mut VB owns its userdata.
|
||||
// There is no way for the userdata to be null or otherwise invalid.
|
||||
let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
|
||||
|
|
@ -179,109 +118,12 @@ extern "C" fn on_frame(sim: *mut VB) -> c_int {
|
|||
1
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
extern "C" fn on_execute(sim: *mut VB, address: u32, _code: *const u16, _length: c_int) -> c_int {
|
||||
// SAFETY: the *mut VB owns its userdata.
|
||||
// There is no way for the userdata to be null or otherwise invalid.
|
||||
let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
|
||||
|
||||
let mut stopped = data.stop_reason.is_some();
|
||||
if data.step_from.is_some_and(|s| s != address) {
|
||||
data.step_from = None;
|
||||
data.stop_reason = Some(StopReason::Stepped);
|
||||
stopped = true;
|
||||
}
|
||||
if data.breakpoints.binary_search(&address).is_ok() {
|
||||
data.stop_reason = Some(StopReason::Breakpoint);
|
||||
stopped = true;
|
||||
}
|
||||
|
||||
if stopped {
|
||||
1
|
||||
} else {
|
||||
0
|
||||
}
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
extern "C" fn on_read(
|
||||
sim: *mut VB,
|
||||
address: u32,
|
||||
_type: VBDataType,
|
||||
_value: *mut i32,
|
||||
_cycles: *mut u32,
|
||||
) -> c_int {
|
||||
// SAFETY: the *mut VB owns its userdata.
|
||||
// There is no way for the userdata to be null or otherwise invalid.
|
||||
let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
|
||||
|
||||
if let Some(start) = data.read_watchpoints.start_of_range_containing(address) {
|
||||
let watch = if data.write_watchpoints.contains(address) {
|
||||
VBWatchpointType::Access
|
||||
} else {
|
||||
VBWatchpointType::Read
|
||||
};
|
||||
data.stop_reason = Some(StopReason::Watchpoint(watch, start));
|
||||
}
|
||||
|
||||
// Don't stop here, the debugger expects us to break after the memory access.
|
||||
// We'll stop in on_execute instead.
|
||||
0
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
extern "C" fn on_write(
|
||||
sim: *mut VB,
|
||||
address: u32,
|
||||
_type: VBDataType,
|
||||
_value: *mut i32,
|
||||
_cycles: *mut u32,
|
||||
_cancel: *mut c_int,
|
||||
) -> c_int {
|
||||
// SAFETY: the *mut VB owns its userdata.
|
||||
// There is no way for the userdata to be null or otherwise invalid.
|
||||
let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
|
||||
|
||||
if let Some(start) = data.write_watchpoints.start_of_range_containing(address) {
|
||||
let watch = if data.read_watchpoints.contains(address) {
|
||||
VBWatchpointType::Access
|
||||
} else {
|
||||
VBWatchpointType::Write
|
||||
};
|
||||
data.stop_reason = Some(StopReason::Watchpoint(watch, start));
|
||||
}
|
||||
|
||||
// Don't stop here, the debugger expects us to break after the memory access.
|
||||
// We'll stop in on_execute instead.
|
||||
0
|
||||
}
|
||||
|
||||
const AUDIO_CAPACITY_SAMPLES: usize = 834 * 4;
|
||||
const AUDIO_CAPACITY_FLOATS: usize = AUDIO_CAPACITY_SAMPLES * 2;
|
||||
pub const EXPECTED_FRAME_SIZE: usize = 834 * 2;
|
||||
|
||||
struct VBState {
|
||||
frame_seen: bool,
|
||||
stop_reason: Option<StopReason>,
|
||||
step_from: Option<u32>,
|
||||
breakpoints: Vec<u32>,
|
||||
read_watchpoints: AddressSet,
|
||||
write_watchpoints: AddressSet,
|
||||
}
|
||||
|
||||
impl VBState {
|
||||
fn needs_execute_callback(&self) -> bool {
|
||||
self.step_from.is_some()
|
||||
|| !self.breakpoints.is_empty()
|
||||
|| !self.read_watchpoints.is_empty()
|
||||
|| !self.write_watchpoints.is_empty()
|
||||
}
|
||||
}
|
||||
|
||||
pub enum StopReason {
|
||||
Breakpoint,
|
||||
Watchpoint(VBWatchpointType, u32),
|
||||
Stepped,
|
||||
}
|
||||
|
||||
#[repr(transparent)]
|
||||
|
|
@ -289,6 +131,9 @@ pub struct Sim {
|
|||
sim: *mut VB,
|
||||
}
|
||||
|
||||
// SAFETY: the memory pointed to by sim is valid
|
||||
unsafe impl Send for Sim {}
|
||||
|
||||
impl Sim {
|
||||
pub fn new() -> Self {
|
||||
// init the VB instance itself
|
||||
|
|
@ -297,22 +142,13 @@ impl Sim {
|
|||
let memory = vec![0u64; size.div_ceil(4)];
|
||||
let sim: *mut VB = Box::into_raw(memory.into_boxed_slice()).cast();
|
||||
unsafe { vb_init(sim) };
|
||||
// pseudohalt is disabled due to breaking red alarm
|
||||
unsafe { vb_set_option(sim, VBOption::PseudoHalt, 0) };
|
||||
unsafe { vb_set_keys(sim, VBKey::SGN.bits()) };
|
||||
unsafe { vb_set_option(sim, VBOption::PseudoHalt, 1) };
|
||||
unsafe { vb_reset(sim) };
|
||||
|
||||
// set up userdata
|
||||
let state = VBState {
|
||||
frame_seen: false,
|
||||
stop_reason: None,
|
||||
step_from: None,
|
||||
breakpoints: vec![],
|
||||
read_watchpoints: AddressSet::new(),
|
||||
write_watchpoints: AddressSet::new(),
|
||||
};
|
||||
let state = VBState { frame_seen: false };
|
||||
unsafe { vb_set_user_data(sim, Box::into_raw(Box::new(state)).cast()) };
|
||||
unsafe { vb_set_frame_callback(sim, Some(on_frame)) };
|
||||
unsafe { vb_set_frame_callback(sim, on_frame) };
|
||||
|
||||
// set up audio buffer
|
||||
let audio_buffer = vec![0.0f32; AUDIO_CAPACITY_FLOATS];
|
||||
|
|
@ -326,58 +162,41 @@ impl Sim {
|
|||
unsafe { vb_reset(self.sim) };
|
||||
}
|
||||
|
||||
pub fn load_cart(&mut self, mut rom: Vec<u8>, mut sram: Vec<u8>) -> Result<()> {
|
||||
self.unload_cart();
|
||||
|
||||
rom.shrink_to_fit();
|
||||
sram.shrink_to_fit();
|
||||
pub fn load_rom(&mut self, rom: Vec<u8>) -> Result<()> {
|
||||
self.unload_rom();
|
||||
|
||||
let size = rom.len() as u32;
|
||||
let rom = Box::into_raw(rom.into_boxed_slice()).cast();
|
||||
let status = unsafe { vb_set_cart_rom(self.sim, rom, size) };
|
||||
if status != 0 {
|
||||
if status == 0 {
|
||||
Ok(())
|
||||
} else {
|
||||
let _: Vec<u8> =
|
||||
unsafe { Vec::from_raw_parts(rom.cast(), size as usize, size as usize) };
|
||||
return Err(anyhow!("Invalid ROM size of {} bytes", size));
|
||||
Err(anyhow!("Invalid ROM size of {} bytes", size))
|
||||
}
|
||||
|
||||
let size = sram.len() as u32;
|
||||
let sram = Box::into_raw(sram.into_boxed_slice()).cast();
|
||||
let status = unsafe { vb_set_cart_ram(self.sim, sram, size) };
|
||||
if status != 0 {
|
||||
let _: Vec<u8> =
|
||||
unsafe { Vec::from_raw_parts(sram.cast(), size as usize, size as usize) };
|
||||
return Err(anyhow!("Invalid SRAM size of {} bytes", size));
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn unload_cart(&mut self) {
|
||||
pub fn clone_rom(&self) -> Option<Vec<u8>> {
|
||||
let mut size = 0;
|
||||
let rom = unsafe { vb_get_cart_rom(self.sim, &mut size) };
|
||||
unsafe { vb_set_cart_rom(self.sim, ptr::null_mut(), 0) };
|
||||
if !rom.is_null() {
|
||||
let _: Vec<u8> =
|
||||
unsafe { Vec::from_raw_parts(rom.cast(), size as usize, size as usize) };
|
||||
}
|
||||
|
||||
let sram = unsafe { vb_get_cart_ram(self.sim, &mut size) };
|
||||
unsafe { vb_set_cart_ram(self.sim, ptr::null_mut(), 0) };
|
||||
if !sram.is_null() {
|
||||
let _: Vec<u8> =
|
||||
unsafe { Vec::from_raw_parts(sram.cast(), size as usize, size as usize) };
|
||||
if rom.is_null() {
|
||||
return None;
|
||||
}
|
||||
// SAFETY: rom definitely points to a valid array of `size` bytes
|
||||
let slice: &[u8] = unsafe { slice::from_raw_parts(rom.cast(), size as usize) };
|
||||
Some(slice.to_vec())
|
||||
}
|
||||
|
||||
pub fn read_sram(&mut self, buffer: &mut [u8]) {
|
||||
fn unload_rom(&mut self) -> Option<Vec<u8>> {
|
||||
let mut size = 0;
|
||||
let sram = unsafe { vb_get_cart_ram(self.sim, &mut size) };
|
||||
if sram.is_null() {
|
||||
return;
|
||||
let rom = unsafe { vb_get_cart_rom(self.sim, &mut size) };
|
||||
if rom.is_null() {
|
||||
return None;
|
||||
}
|
||||
let bytes = unsafe { slice::from_raw_parts(sram.cast(), size as usize) };
|
||||
buffer.copy_from_slice(bytes);
|
||||
unsafe { vb_set_cart_rom(self.sim, ptr::null_mut(), 0) };
|
||||
let vec = unsafe { Vec::from_raw_parts(rom.cast(), size as usize, size as usize) };
|
||||
Some(vec)
|
||||
}
|
||||
|
||||
pub fn link(&mut self, peer: &mut Sim) {
|
||||
|
|
@ -401,7 +220,9 @@ impl Sim {
|
|||
}
|
||||
|
||||
pub fn read_pixels(&mut self, buffers: &mut [u8]) -> bool {
|
||||
let data = self.get_state();
|
||||
// SAFETY: the *mut VB owns its userdata.
|
||||
// There is no way for the userdata to be null or otherwise invalid.
|
||||
let data: &mut VBState = unsafe { &mut *vb_get_user_data(self.sim).cast() };
|
||||
if !data.frame_seen {
|
||||
return false;
|
||||
}
|
||||
|
|
@ -448,167 +269,6 @@ impl Sim {
|
|||
pub fn set_keys(&mut self, keys: VBKey) {
|
||||
unsafe { vb_set_keys(self.sim, keys.bits()) };
|
||||
}
|
||||
|
||||
pub fn read_register(&mut self, register: VBRegister) -> u32 {
|
||||
match register {
|
||||
VBRegister::Program(index) => unsafe {
|
||||
vb_get_program_register(self.sim, index) as u32
|
||||
},
|
||||
VBRegister::System(index) => unsafe { vb_get_system_register(self.sim, index) as u32 },
|
||||
VBRegister::PC => unsafe { vb_get_program_counter(self.sim) },
|
||||
}
|
||||
}
|
||||
|
||||
pub fn write_register(&mut self, register: VBRegister, value: u32) {
|
||||
match register {
|
||||
VBRegister::Program(index) => unsafe {
|
||||
vb_set_program_register(self.sim, index, value as i32);
|
||||
},
|
||||
VBRegister::System(index) => unsafe {
|
||||
vb_set_system_register(self.sim, index, value);
|
||||
},
|
||||
VBRegister::PC => unsafe {
|
||||
vb_set_program_counter(self.sim, value);
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
pub fn read_memory(&mut self, start: u32, length: usize, into: &mut Vec<u8>) {
|
||||
let mut address = start;
|
||||
for _ in 0..length {
|
||||
let byte = unsafe { vb_read(self.sim, address, VBDataType::U8) };
|
||||
into.push(byte as u8);
|
||||
address = address.wrapping_add(1);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn write_memory(&mut self, start: u32, buffer: &[u8]) {
|
||||
let mut address = start;
|
||||
for byte in buffer {
|
||||
unsafe { vb_write(self.sim, address, VBDataType::U8, *byte as i32) };
|
||||
address = address.wrapping_add(1);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn add_breakpoint(&mut self, address: u32) {
|
||||
let data = self.get_state();
|
||||
if let Err(index) = data.breakpoints.binary_search(&address) {
|
||||
data.breakpoints.insert(index, address);
|
||||
}
|
||||
|
||||
unsafe {
|
||||
vb_set_execute_callback(self.sim, Some(on_execute));
|
||||
}
|
||||
}
|
||||
|
||||
pub fn remove_breakpoint(&mut self, address: u32) {
|
||||
let data = self.get_state();
|
||||
if let Ok(index) = data.breakpoints.binary_search(&address) {
|
||||
data.breakpoints.remove(index);
|
||||
if !data.needs_execute_callback() {
|
||||
unsafe { vb_set_execute_callback(self.sim, None) };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn add_watchpoint(&mut self, address: u32, length: usize, watch: VBWatchpointType) {
|
||||
match watch {
|
||||
VBWatchpointType::Read => self.add_read_watchpoint(address, length),
|
||||
VBWatchpointType::Write => self.add_write_watchpoint(address, length),
|
||||
VBWatchpointType::Access => {
|
||||
self.add_read_watchpoint(address, length);
|
||||
self.add_write_watchpoint(address, length);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn add_read_watchpoint(&mut self, address: u32, length: usize) {
|
||||
let state = self.get_state();
|
||||
state.read_watchpoints.add(address, length);
|
||||
if !state.read_watchpoints.is_empty() {
|
||||
unsafe { vb_set_read_callback(self.sim, Some(on_read)) };
|
||||
unsafe { vb_set_execute_callback(self.sim, Some(on_execute)) };
|
||||
}
|
||||
}
|
||||
|
||||
fn add_write_watchpoint(&mut self, address: u32, length: usize) {
|
||||
let state = self.get_state();
|
||||
state.write_watchpoints.add(address, length);
|
||||
if !state.write_watchpoints.is_empty() {
|
||||
unsafe { vb_set_write_callback(self.sim, Some(on_write)) };
|
||||
unsafe { vb_set_execute_callback(self.sim, Some(on_execute)) };
|
||||
}
|
||||
}
|
||||
|
||||
pub fn remove_watchpoint(&mut self, address: u32, length: usize, watch: VBWatchpointType) {
|
||||
match watch {
|
||||
VBWatchpointType::Read => self.remove_read_watchpoint(address, length),
|
||||
VBWatchpointType::Write => self.remove_write_watchpoint(address, length),
|
||||
VBWatchpointType::Access => {
|
||||
self.remove_read_watchpoint(address, length);
|
||||
self.remove_write_watchpoint(address, length);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn remove_read_watchpoint(&mut self, address: u32, length: usize) {
|
||||
let state = self.get_state();
|
||||
state.read_watchpoints.remove(address, length);
|
||||
let needs_execute = state.needs_execute_callback();
|
||||
if state.read_watchpoints.is_empty() {
|
||||
unsafe { vb_set_read_callback(self.sim, None) };
|
||||
if !needs_execute {
|
||||
unsafe { vb_set_execute_callback(self.sim, None) };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn remove_write_watchpoint(&mut self, address: u32, length: usize) {
|
||||
let state = self.get_state();
|
||||
state.write_watchpoints.remove(address, length);
|
||||
let needs_execute = state.needs_execute_callback();
|
||||
if state.write_watchpoints.is_empty() {
|
||||
unsafe { vb_set_write_callback(self.sim, None) };
|
||||
if !needs_execute {
|
||||
unsafe { vb_set_execute_callback(self.sim, None) };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn step(&mut self) {
|
||||
let current_pc = unsafe { vb_get_program_counter(self.sim) };
|
||||
let data = self.get_state();
|
||||
data.step_from = Some(current_pc);
|
||||
unsafe {
|
||||
vb_set_execute_callback(self.sim, Some(on_execute));
|
||||
}
|
||||
}
|
||||
|
||||
pub fn clear_debug_state(&mut self) {
|
||||
let data = self.get_state();
|
||||
data.step_from = None;
|
||||
data.breakpoints.clear();
|
||||
data.read_watchpoints.clear();
|
||||
data.write_watchpoints.clear();
|
||||
unsafe { vb_set_read_callback(self.sim, None) };
|
||||
unsafe { vb_set_write_callback(self.sim, None) };
|
||||
unsafe { vb_set_execute_callback(self.sim, None) };
|
||||
}
|
||||
|
||||
pub fn stop_reason(&mut self) -> Option<StopReason> {
|
||||
let data = self.get_state();
|
||||
let reason = data.stop_reason.take();
|
||||
if !data.needs_execute_callback() {
|
||||
unsafe { vb_set_execute_callback(self.sim, None) };
|
||||
}
|
||||
reason
|
||||
}
|
||||
|
||||
fn get_state(&mut self) -> &mut VBState {
|
||||
// SAFETY: the *mut VB owns its userdata.
|
||||
// There is no way for the userdata to be null or otherwise invalid.
|
||||
unsafe { &mut *vb_get_user_data(self.sim).cast() }
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for Sim {
|
||||
|
|
|
|||
560
src/gdbserver.rs
560
src/gdbserver.rs
|
|
@ -1,560 +0,0 @@
|
|||
use anyhow::{bail, Result};
|
||||
use registers::REGISTERS;
|
||||
use request::{Request, RequestKind, RequestSource};
|
||||
use response::Response;
|
||||
use std::{
|
||||
sync::{Arc, Mutex},
|
||||
thread,
|
||||
};
|
||||
use tokio::{
|
||||
io::{AsyncWriteExt as _, BufReader},
|
||||
net::{TcpListener, TcpStream},
|
||||
pin, select,
|
||||
sync::{mpsc, oneshot},
|
||||
};
|
||||
use tracing::{debug, enabled, error, info, Level};
|
||||
|
||||
use crate::emulator::{
|
||||
DebugEvent, DebugStopReason, EmulatorClient, EmulatorCommand, SimId, VBWatchpointType,
|
||||
};
|
||||
|
||||
mod registers;
|
||||
mod request;
|
||||
mod response;
|
||||
|
||||
pub struct GdbServer {
|
||||
sim_id: SimId,
|
||||
client: EmulatorClient,
|
||||
status: Arc<Mutex<GdbServerStatus>>,
|
||||
killer: Option<oneshot::Sender<()>>,
|
||||
}
|
||||
|
||||
impl GdbServer {
|
||||
pub fn new(sim_id: SimId, client: EmulatorClient) -> Self {
|
||||
Self {
|
||||
sim_id,
|
||||
client,
|
||||
status: Arc::new(Mutex::new(GdbServerStatus::Stopped)),
|
||||
killer: None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn status(&self) -> GdbServerStatus {
|
||||
self.status.lock().unwrap().clone()
|
||||
}
|
||||
|
||||
pub fn start(&mut self, port: u16) {
|
||||
*self.status.lock().unwrap() = GdbServerStatus::Connecting;
|
||||
let sim_id = self.sim_id;
|
||||
let client = self.client.clone();
|
||||
let status = self.status.clone();
|
||||
let (tx, rx) = oneshot::channel();
|
||||
self.killer = Some(tx);
|
||||
thread::spawn(move || {
|
||||
tokio::runtime::Builder::new_current_thread()
|
||||
.enable_all()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block_on(async move {
|
||||
select! {
|
||||
_ = run_server(sim_id, client.clone(), port, &status) => {}
|
||||
_ = rx => {
|
||||
client.send_command(EmulatorCommand::StopDebugging(sim_id));
|
||||
*status.lock().unwrap() = GdbServerStatus::Stopped;
|
||||
}
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
pub fn stop(&mut self) {
|
||||
if let Some(killer) = self.killer.take() {
|
||||
let _ = killer.send(());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for GdbServer {
|
||||
fn drop(&mut self) {
|
||||
self.stop();
|
||||
}
|
||||
}
|
||||
|
||||
async fn run_server(
|
||||
sim_id: SimId,
|
||||
client: EmulatorClient,
|
||||
port: u16,
|
||||
status: &Mutex<GdbServerStatus>,
|
||||
) {
|
||||
let (debug_sink, mut debug_source) = mpsc::unbounded_channel();
|
||||
client.send_command(EmulatorCommand::StartDebugging(sim_id, debug_sink));
|
||||
|
||||
info!("Connecting to debugger on port {port}...");
|
||||
let connect_future = try_connect(port, status);
|
||||
pin!(connect_future);
|
||||
|
||||
let stream = loop {
|
||||
select! {
|
||||
stream = &mut connect_future => {
|
||||
if let Some(stream) = stream {
|
||||
break stream;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
event = debug_source.recv() => {
|
||||
if event.is_none() {
|
||||
// The sim has stopped (or was never started)
|
||||
*status.lock().unwrap() = GdbServerStatus::Stopped;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
info!("Connected!");
|
||||
let mut connection = GdbConnection::new(sim_id, client);
|
||||
match connection.run(stream, debug_source).await {
|
||||
Ok(()) => {
|
||||
info!("Finished debugging.");
|
||||
*status.lock().unwrap() = GdbServerStatus::Stopped;
|
||||
}
|
||||
Err(error) => {
|
||||
error!(%error, "Error from debugger.");
|
||||
*status.lock().unwrap() = GdbServerStatus::Error(error.to_string());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn try_connect(port: u16, status: &Mutex<GdbServerStatus>) -> Option<TcpStream> {
|
||||
*status.lock().unwrap() = GdbServerStatus::Connecting;
|
||||
let listener = match TcpListener::bind(("127.0.0.1", port)).await {
|
||||
Ok(l) => l,
|
||||
Err(err) => {
|
||||
error!(%err, "Could not open port.");
|
||||
*status.lock().unwrap() = GdbServerStatus::Error(err.to_string());
|
||||
return None;
|
||||
}
|
||||
};
|
||||
match listener.accept().await {
|
||||
Ok((stream, _)) => {
|
||||
*status.lock().unwrap() = GdbServerStatus::Running;
|
||||
Some(stream)
|
||||
}
|
||||
Err(err) => {
|
||||
error!(%err, "Could not connect to debugger.");
|
||||
*status.lock().unwrap() = GdbServerStatus::Error(err.to_string());
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub enum GdbServerStatus {
|
||||
Stopped,
|
||||
Connecting,
|
||||
Running,
|
||||
Error(String),
|
||||
}
|
||||
|
||||
impl GdbServerStatus {
|
||||
pub fn running(&self) -> bool {
|
||||
matches!(self, Self::Connecting | Self::Running)
|
||||
}
|
||||
}
|
||||
|
||||
struct GdbConnection {
|
||||
sim_id: SimId,
|
||||
client: EmulatorClient,
|
||||
ack_messages: bool,
|
||||
stop_reason: Option<DebugStopReason>,
|
||||
response_buf: Option<Vec<u8>>,
|
||||
memory_buf: Option<Vec<u8>>,
|
||||
}
|
||||
|
||||
impl GdbConnection {
|
||||
fn new(sim_id: SimId, client: EmulatorClient) -> Self {
|
||||
Self {
|
||||
sim_id,
|
||||
client,
|
||||
ack_messages: true,
|
||||
stop_reason: None,
|
||||
response_buf: None,
|
||||
memory_buf: None,
|
||||
}
|
||||
}
|
||||
async fn run(
|
||||
&mut self,
|
||||
stream: TcpStream,
|
||||
mut debug_source: mpsc::UnboundedReceiver<DebugEvent>,
|
||||
) -> Result<()> {
|
||||
let (rx, mut tx) = stream.into_split();
|
||||
let mut request_source = RequestSource::new(BufReader::new(rx));
|
||||
loop {
|
||||
let response = select! {
|
||||
maybe_event = debug_source.recv() => {
|
||||
let Some(event) = maybe_event else {
|
||||
// debugger has stopped running
|
||||
break;
|
||||
};
|
||||
self.handle_event(event)
|
||||
}
|
||||
maybe_request = request_source.recv() => {
|
||||
let req = maybe_request?;
|
||||
self.handle_request(req)?
|
||||
}
|
||||
};
|
||||
if let Some(res) = response {
|
||||
let buffer = res.finish();
|
||||
if enabled!(Level::DEBUG) {
|
||||
match std::str::from_utf8(&buffer) {
|
||||
Ok(text) => debug!("response: {text}"),
|
||||
Err(_) => debug!("response: {buffer:02x?}"),
|
||||
}
|
||||
}
|
||||
tx.write_all(&buffer).await?;
|
||||
self.response_buf = Some(buffer);
|
||||
tx.flush().await?;
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn handle_event(&mut self, event: DebugEvent) -> Option<Response> {
|
||||
let res = match event {
|
||||
DebugEvent::Stopped(reason) => {
|
||||
if self.stop_reason.is_some_and(|r| r == reason) {
|
||||
return None;
|
||||
}
|
||||
self.stop_reason = Some(reason);
|
||||
self.response()
|
||||
.write_str(&debug_stop_reason_string(self.stop_reason))
|
||||
}
|
||||
};
|
||||
Some(res)
|
||||
}
|
||||
|
||||
fn handle_request(&mut self, mut req: Request<'_>) -> Result<Option<Response>> {
|
||||
debug!("received {:02x?}", req);
|
||||
|
||||
if req.kind == RequestKind::Signal {
|
||||
self.client
|
||||
.send_command(EmulatorCommand::DebugInterrupt(self.sim_id));
|
||||
return Ok(None); // we'll send a message when the emulator reports it has stopped
|
||||
}
|
||||
|
||||
let res = if req.match_str("QStartNoAckMode") {
|
||||
let res = self.response().write_str("OK");
|
||||
self.ack_messages = false;
|
||||
res
|
||||
} else if req.match_str("qSupported:") {
|
||||
self.response()
|
||||
.write_str("multiprocess+;swbreak+;vContSupported+;PacketSize=10000;SupportedWatchpointTypes=x86_64,aarch64-bas,aarch64-mask")
|
||||
} else if req
|
||||
.match_some_str([
|
||||
"QThreadSuffixSupported",
|
||||
"QListThreadsInStopReply",
|
||||
"QEnableErrorStrings",
|
||||
])
|
||||
.is_some()
|
||||
{
|
||||
self.response().write_str("OK")
|
||||
} else if req.match_str("qHostInfo") {
|
||||
self.response().write_str(&format!(
|
||||
"triple:{};endian:little;ptrsize:4;",
|
||||
hex::encode("v810-unknown-vb")
|
||||
))
|
||||
} else if req.match_str("qProcessInfo") {
|
||||
self.response().write_str(&format!(
|
||||
"pid:1;triple:{};endian:little;ptrsize:4;",
|
||||
hex::encode("v810-unknown-vb")
|
||||
))
|
||||
} else if req.match_str("qRegisterInfo") {
|
||||
let mut get_reg_info = || {
|
||||
let register = req.match_hex::<usize>()?;
|
||||
REGISTERS.get(register)
|
||||
};
|
||||
if let Some(reg_info) = get_reg_info() {
|
||||
self.response().write_str(®_info.to_description())
|
||||
} else {
|
||||
self.response()
|
||||
}
|
||||
} else if req.match_str("vCont?") {
|
||||
self.response().write_str("vCont;c;s;")
|
||||
} else if req.match_str("qC") {
|
||||
// The v810 has no threads, so report that the "current thread" is 1.
|
||||
self.response().write_str("QCp1.t1")
|
||||
} else if req.match_str("qfThreadInfo") {
|
||||
self.response().write_str("mp1.t1")
|
||||
} else if req.match_str("qsThreadInfo") {
|
||||
self.response().write_str("l")
|
||||
} else if req.match_str("k") {
|
||||
bail!("debug process was killed");
|
||||
} else if req.match_str("?") {
|
||||
self.response()
|
||||
.write_str(&debug_stop_reason_string(self.stop_reason))
|
||||
} else if req.match_some_str(["c", "vCont;c:"]).is_some() {
|
||||
self.client
|
||||
.send_command(EmulatorCommand::DebugContinue(self.sim_id));
|
||||
self.stop_reason = None;
|
||||
// Don't send a response until we hit a breakpoint or get interrupted
|
||||
return Ok(None);
|
||||
} else if req.match_some_str(["s", "vCont;s:"]).is_some() {
|
||||
self.client
|
||||
.send_command(EmulatorCommand::DebugStep(self.sim_id));
|
||||
self.stop_reason = None;
|
||||
// Don't send a response until we hit a breakpoint or get interrupted
|
||||
return Ok(None);
|
||||
} else if req.match_str("p") {
|
||||
let mut read_register = || {
|
||||
let register_index = req.match_hex::<usize>()?;
|
||||
let register = REGISTERS.get(register_index)?.to_vb_register();
|
||||
let (tx, rx) = ::oneshot::channel();
|
||||
self.client
|
||||
.send_command(EmulatorCommand::ReadRegister(self.sim_id, register, tx));
|
||||
rx.recv().ok()
|
||||
};
|
||||
if let Some(value) = read_register() {
|
||||
self.response().write_hex(value)
|
||||
} else {
|
||||
self.response()
|
||||
}
|
||||
} else if req.match_str("P") {
|
||||
let mut write_register = || {
|
||||
let register_index = req.match_hex::<usize>()?;
|
||||
let register = REGISTERS.get(register_index)?.to_vb_register();
|
||||
if !req.match_str("=") {
|
||||
return None;
|
||||
}
|
||||
let value = {
|
||||
let mut buffer = [0; 4];
|
||||
if !req.match_hex_bytes(&mut buffer) {
|
||||
return None;
|
||||
}
|
||||
u32::from_le_bytes(buffer)
|
||||
};
|
||||
self.client.send_command(EmulatorCommand::WriteRegister(
|
||||
self.sim_id,
|
||||
register,
|
||||
value,
|
||||
));
|
||||
Some(())
|
||||
};
|
||||
if let Some(()) = write_register() {
|
||||
self.response().write_str("OK")
|
||||
} else {
|
||||
self.response()
|
||||
}
|
||||
} else if let Some(op) = req.match_some_str(["m", "x"]) {
|
||||
let mut read_memory = || {
|
||||
let (start, length) = parse_memory_range(&mut req)?;
|
||||
let mut buf = self.memory_buf.take().unwrap_or_default();
|
||||
buf.clear();
|
||||
if length == 0 {
|
||||
return Some(buf);
|
||||
}
|
||||
let (tx, rx) = ::oneshot::channel();
|
||||
self.client.send_command(EmulatorCommand::ReadMemory(
|
||||
self.sim_id,
|
||||
start,
|
||||
length,
|
||||
buf,
|
||||
tx,
|
||||
));
|
||||
rx.recv().ok()
|
||||
};
|
||||
if let Some(memory) = read_memory() {
|
||||
let mut res = self.response();
|
||||
if memory.is_empty() {
|
||||
res = res.write_str("OK");
|
||||
} else if op == "m" {
|
||||
// send the hex-encoded byte stream
|
||||
for byte in &memory {
|
||||
res = res.write_hex(*byte);
|
||||
}
|
||||
} else {
|
||||
// send the raw byte stream
|
||||
for byte in &memory {
|
||||
res = res.write_byte(*byte);
|
||||
}
|
||||
}
|
||||
self.memory_buf = Some(memory);
|
||||
res
|
||||
} else {
|
||||
self.response()
|
||||
}
|
||||
} else if let Some(op) = req.match_some_str(["M", "X"]) {
|
||||
let mut write_memory = || {
|
||||
let (start, length) = parse_memory_range(&mut req)?;
|
||||
if length == 0 {
|
||||
return Some(());
|
||||
}
|
||||
if !req.match_str(":") {
|
||||
return None;
|
||||
}
|
||||
let mut buf = self.memory_buf.take().unwrap_or_default();
|
||||
buf.resize(length, 0);
|
||||
let successful_read = if op == "M" {
|
||||
req.match_hex_bytes(&mut buf)
|
||||
} else {
|
||||
req.match_bytes(&mut buf)
|
||||
};
|
||||
if !successful_read {
|
||||
self.memory_buf = Some(buf);
|
||||
return None;
|
||||
}
|
||||
let (tx, rx) = ::oneshot::channel();
|
||||
self.client
|
||||
.send_command(EmulatorCommand::WriteMemory(self.sim_id, start, buf, tx));
|
||||
let buf = rx.recv().ok()?;
|
||||
self.memory_buf = Some(buf);
|
||||
Some(())
|
||||
};
|
||||
if write_memory().is_some() {
|
||||
self.response().write_str("OK")
|
||||
} else {
|
||||
self.response()
|
||||
}
|
||||
} else if req.match_str("Z") {
|
||||
let mut parse_request = || {
|
||||
let type_ = req.match_hex::<u8>()?;
|
||||
if !req.match_str(",") {
|
||||
return None;
|
||||
}
|
||||
let address = req.match_hex()?;
|
||||
if type_ == 0 || type_ == 1 {
|
||||
return Some(EmulatorCommand::AddBreakpoint(self.sim_id, address));
|
||||
}
|
||||
if !req.match_str(",") {
|
||||
return None;
|
||||
}
|
||||
let length = req.match_hex()?;
|
||||
let watch = match type_ {
|
||||
2 => VBWatchpointType::Write,
|
||||
3 => VBWatchpointType::Read,
|
||||
4 => VBWatchpointType::Access,
|
||||
_ => return None,
|
||||
};
|
||||
Some(EmulatorCommand::AddWatchpoint(
|
||||
self.sim_id,
|
||||
address,
|
||||
length,
|
||||
watch,
|
||||
))
|
||||
};
|
||||
if let Some(command) = parse_request() {
|
||||
self.client.send_command(command);
|
||||
self.response().write_str("OK")
|
||||
} else {
|
||||
self.response()
|
||||
}
|
||||
} else if req.match_str("z") {
|
||||
let mut parse_request = || {
|
||||
let type_ = req.match_hex::<u8>()?;
|
||||
if !req.match_str(",") {
|
||||
return None;
|
||||
}
|
||||
let address = req.match_hex()?;
|
||||
if type_ == 0 || type_ == 1 {
|
||||
return Some(EmulatorCommand::RemoveBreakpoint(self.sim_id, address));
|
||||
}
|
||||
if !req.match_str(",") {
|
||||
return None;
|
||||
}
|
||||
let length = req.match_hex()?;
|
||||
let watch = match type_ {
|
||||
2 => VBWatchpointType::Write,
|
||||
3 => VBWatchpointType::Read,
|
||||
4 => VBWatchpointType::Access,
|
||||
_ => return None,
|
||||
};
|
||||
Some(EmulatorCommand::RemoveWatchpoint(
|
||||
self.sim_id,
|
||||
address,
|
||||
length,
|
||||
watch,
|
||||
))
|
||||
};
|
||||
if let Some(command) = parse_request() {
|
||||
self.client.send_command(command);
|
||||
self.response().write_str("OK")
|
||||
} else {
|
||||
self.response()
|
||||
}
|
||||
} else {
|
||||
// unrecognized command
|
||||
self.response()
|
||||
};
|
||||
Ok(Some(res))
|
||||
}
|
||||
|
||||
fn response(&mut self) -> Response {
|
||||
Response::new(
|
||||
self.response_buf.take().unwrap_or_default(),
|
||||
self.ack_messages,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for GdbConnection {
|
||||
fn drop(&mut self) {
|
||||
self.client
|
||||
.send_command(EmulatorCommand::StopDebugging(self.sim_id));
|
||||
}
|
||||
}
|
||||
|
||||
// parse a memory range into a start and a length.
|
||||
fn parse_memory_range(req: &mut Request<'_>) -> Option<(u32, usize)> {
|
||||
let start = req.match_hex::<u64>()?;
|
||||
if !req.match_str(",") {
|
||||
return None;
|
||||
};
|
||||
let length = req.match_hex::<usize>()?;
|
||||
let Ok(start) = u32::try_from(start) else {
|
||||
// The v810 has a 32-bit address space.
|
||||
// Addresses wrap within that space, but we don't need to implement that for 64-bit addresses.
|
||||
// Just refuse to return any info for addresses above 0xffffffff.
|
||||
return Some((0, 0));
|
||||
};
|
||||
let length = length.min((u32::MAX - start) as usize + 1);
|
||||
Some((start, length))
|
||||
}
|
||||
|
||||
fn debug_stop_reason_string(reason: Option<DebugStopReason>) -> String {
|
||||
let mut result = String::new();
|
||||
result += if reason.is_some_and(|r| r != DebugStopReason::Paused) {
|
||||
"T05;"
|
||||
} else {
|
||||
"T00;"
|
||||
};
|
||||
if let Some(DebugStopReason::Breakpoint) = reason {
|
||||
result += "swbreak;";
|
||||
}
|
||||
if let Some(DebugStopReason::Watchpoint(watch, address)) = reason {
|
||||
result += match watch {
|
||||
VBWatchpointType::Write => "watch:",
|
||||
VBWatchpointType::Read => "rwatch:",
|
||||
VBWatchpointType::Access => "awatch:",
|
||||
};
|
||||
result += &format!("{address:08x};");
|
||||
}
|
||||
|
||||
result += "thread:p1.t1;threads:p1.t1;";
|
||||
|
||||
if let Some(reason) = reason {
|
||||
result += "reason:";
|
||||
result += match reason {
|
||||
DebugStopReason::Trace => "trace;",
|
||||
DebugStopReason::Breakpoint => "breakpoint;",
|
||||
DebugStopReason::Watchpoint(_, _) => "watchpoint;",
|
||||
DebugStopReason::Paused => "trap;",
|
||||
};
|
||||
}
|
||||
|
||||
if let Some(DebugStopReason::Watchpoint(_, address)) = reason {
|
||||
result += "description:";
|
||||
result += &hex::encode(address.to_string());
|
||||
result += ";";
|
||||
}
|
||||
|
||||
result
|
||||
}
|
||||
|
|
@ -1,130 +0,0 @@
|
|||
use crate::emulator::VBRegister;
|
||||
|
||||
pub struct RegisterInfo {
|
||||
dwarf: u32,
|
||||
name: &'static str,
|
||||
set: &'static str,
|
||||
alt_name: Option<&'static str>,
|
||||
generic: Option<&'static str>,
|
||||
}
|
||||
|
||||
impl RegisterInfo {
|
||||
pub fn to_description(&self) -> String {
|
||||
let mut string = format!("name:{}", self.name);
|
||||
if let Some(alt) = self.alt_name {
|
||||
string.push_str(&format!(";alt-name:{}", alt));
|
||||
}
|
||||
string.push_str(&format!(
|
||||
";bitsize:32;offset:{};encoding:uint;format:hex;set:{};dwarf:{}",
|
||||
self.dwarf * 4,
|
||||
self.set,
|
||||
self.dwarf
|
||||
));
|
||||
if let Some(generic) = self.generic {
|
||||
string.push_str(&format!(";generic:{}", generic));
|
||||
}
|
||||
string
|
||||
}
|
||||
|
||||
pub fn to_vb_register(&self) -> VBRegister {
|
||||
match self.dwarf {
|
||||
0..32 => VBRegister::Program(self.dwarf),
|
||||
32..40 => VBRegister::System(self.dwarf - 32),
|
||||
40..42 => VBRegister::System(self.dwarf - 16),
|
||||
42..45 => VBRegister::System(self.dwarf - 13),
|
||||
45 => VBRegister::PC,
|
||||
other => panic!("unexpected DWARF register {other}"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
macro_rules! register {
|
||||
($set:expr, $dwarf:expr, $name:expr) => {
|
||||
RegisterInfo {
|
||||
dwarf: $dwarf,
|
||||
name: $name,
|
||||
set: $set,
|
||||
alt_name: None,
|
||||
generic: None,
|
||||
}
|
||||
};
|
||||
($set:expr, $dwarf:expr, $name:expr, alt: $alt:expr) => {
|
||||
RegisterInfo {
|
||||
dwarf: $dwarf,
|
||||
name: $name,
|
||||
set: $set,
|
||||
alt_name: Some($alt),
|
||||
generic: None,
|
||||
}
|
||||
};
|
||||
($set:expr, $dwarf:expr, $name:expr, generic: $generic:expr) => {
|
||||
RegisterInfo {
|
||||
dwarf: $dwarf,
|
||||
name: $name,
|
||||
set: $set,
|
||||
alt_name: None,
|
||||
generic: Some($generic),
|
||||
}
|
||||
};
|
||||
($set:expr, $dwarf:expr, $name:expr, alt: $alt:expr, generic: $generic:expr) => {
|
||||
RegisterInfo {
|
||||
dwarf: $dwarf,
|
||||
name: $name,
|
||||
set: $set,
|
||||
alt_name: Some($alt),
|
||||
generic: Some($generic),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
const GENERAL: &str = "General Purpose Registers";
|
||||
const SPECIAL: &str = "Special Registers";
|
||||
|
||||
pub const REGISTERS: [RegisterInfo; 46] = [
|
||||
register!(GENERAL, 0, "r0"),
|
||||
register!(GENERAL, 1, "r1"),
|
||||
register!(GENERAL, 2, "fp", alt: "r2", generic: "fp"),
|
||||
register!(GENERAL, 3, "sp", alt: "r3", generic: "sp"),
|
||||
register!(GENERAL, 4, "gp", alt: "r4"),
|
||||
register!(GENERAL, 5, "tp", alt: "r5"),
|
||||
register!(GENERAL, 6, "r6", generic: "arg1"),
|
||||
register!(GENERAL, 7, "r7", generic: "arg2"),
|
||||
register!(GENERAL, 8, "r8", generic: "arg3"),
|
||||
register!(GENERAL, 9, "r9", generic: "arg4"),
|
||||
register!(GENERAL, 10, "r10"),
|
||||
register!(GENERAL, 11, "r11"),
|
||||
register!(GENERAL, 12, "r12"),
|
||||
register!(GENERAL, 13, "r13"),
|
||||
register!(GENERAL, 14, "r14"),
|
||||
register!(GENERAL, 15, "r15"),
|
||||
register!(GENERAL, 16, "r16"),
|
||||
register!(GENERAL, 17, "r17"),
|
||||
register!(GENERAL, 18, "r18"),
|
||||
register!(GENERAL, 19, "r19"),
|
||||
register!(GENERAL, 20, "r20"),
|
||||
register!(GENERAL, 21, "r21"),
|
||||
register!(GENERAL, 22, "r22"),
|
||||
register!(GENERAL, 23, "r23"),
|
||||
register!(GENERAL, 24, "r24"),
|
||||
register!(GENERAL, 25, "r25"),
|
||||
register!(GENERAL, 26, "r26"),
|
||||
register!(GENERAL, 27, "r27"),
|
||||
register!(GENERAL, 28, "r28"),
|
||||
register!(GENERAL, 29, "r29"),
|
||||
register!(GENERAL, 30, "r30"),
|
||||
register!(GENERAL, 31, "lp", alt: "r31", generic: "ra"),
|
||||
register!(SPECIAL, 32, "eipc", alt: "sr0"),
|
||||
register!(SPECIAL, 33, "eipsw", alt: "sr1"),
|
||||
register!(SPECIAL, 34, "fepc", alt: "sr2"),
|
||||
register!(SPECIAL, 35, "fepsw", alt: "sr3"),
|
||||
register!(SPECIAL, 36, "ecr", alt: "sr4"),
|
||||
register!(SPECIAL, 37, "psw", alt: "sr5", generic: "flags"),
|
||||
register!(SPECIAL, 38, "pir", alt: "sr6"),
|
||||
register!(SPECIAL, 39, "tkcw", alt: "sr7"),
|
||||
register!(SPECIAL, 40, "chcw", alt: "sr24"),
|
||||
register!(SPECIAL, 41, "adtre", alt: "sr25"),
|
||||
register!(SPECIAL, 42, "sr29"),
|
||||
register!(SPECIAL, 43, "sr30"),
|
||||
register!(SPECIAL, 44, "sr31"),
|
||||
register!(SPECIAL, 45, "pc", generic: "pc"),
|
||||
];
|
||||
|
|
@ -1,202 +0,0 @@
|
|||
use anyhow::{bail, Result};
|
||||
use atoi::FromRadix16;
|
||||
use tokio::io::{AsyncRead, AsyncReadExt as _};
|
||||
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub enum RequestKind {
|
||||
Signal,
|
||||
Command,
|
||||
}
|
||||
impl RequestKind {
|
||||
fn name(self) -> &'static str {
|
||||
match self {
|
||||
Self::Signal => "Signal",
|
||||
Self::Command => "Command",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Request<'a> {
|
||||
pub kind: RequestKind,
|
||||
buffer: &'a [u8],
|
||||
}
|
||||
|
||||
impl std::fmt::Debug for Request<'_> {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
let mut ds = f.debug_tuple(self.kind.name());
|
||||
match self.kind {
|
||||
RequestKind::Signal => ds.field(&self.buffer),
|
||||
RequestKind::Command => match std::str::from_utf8(self.buffer) {
|
||||
Ok(str) => ds.field(&str),
|
||||
Err(_) => ds.field(&self.buffer),
|
||||
},
|
||||
};
|
||||
ds.finish()
|
||||
}
|
||||
}
|
||||
|
||||
impl Request<'_> {
|
||||
pub fn match_str(&mut self, prefix: &str) -> bool {
|
||||
if let Some(new_buffer) = self.buffer.strip_prefix(prefix.as_bytes()) {
|
||||
self.buffer = new_buffer;
|
||||
return true;
|
||||
}
|
||||
false
|
||||
}
|
||||
|
||||
pub fn match_some_str<'a, I: IntoIterator<Item = &'a str>>(
|
||||
&mut self,
|
||||
prefixes: I,
|
||||
) -> Option<&'a str> {
|
||||
prefixes.into_iter().find(|&prefix| self.match_str(prefix))
|
||||
}
|
||||
|
||||
pub fn match_hex<I: FromRadix16>(&mut self) -> Option<I> {
|
||||
match I::from_radix_16(self.buffer) {
|
||||
(_, 0) => None,
|
||||
(val, used) => {
|
||||
self.buffer = self.buffer.split_at(used).1;
|
||||
Some(val)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn match_hex_bytes(&mut self, buffer: &mut [u8]) -> bool {
|
||||
if self.buffer.len() < buffer.len() * 2 {
|
||||
return false;
|
||||
}
|
||||
for (i, item) in buffer.iter_mut().enumerate() {
|
||||
match u8::from_radix_16(&self.buffer[(i * 2)..(i * 2) + 2]) {
|
||||
(byte, 2) => *item = byte,
|
||||
_ => return false,
|
||||
};
|
||||
}
|
||||
self.buffer = self.buffer.split_at(buffer.len()).1;
|
||||
true
|
||||
}
|
||||
|
||||
pub fn match_bytes(&mut self, buffer: &mut [u8]) -> bool {
|
||||
if self.buffer.len() < buffer.len() {
|
||||
return false;
|
||||
}
|
||||
buffer.copy_from_slice(&self.buffer[0..buffer.len()]);
|
||||
self.buffer = self.buffer.split_at(buffer.len()).1;
|
||||
true
|
||||
}
|
||||
}
|
||||
|
||||
pub struct RequestSource<R> {
|
||||
reader: R,
|
||||
buffer: Vec<u8>,
|
||||
state: RequestReadState,
|
||||
}
|
||||
|
||||
impl<R: AsyncRead + Unpin> RequestSource<R> {
|
||||
pub fn new(reader: R) -> Self {
|
||||
Self {
|
||||
reader,
|
||||
buffer: vec![],
|
||||
state: RequestReadState::Header,
|
||||
}
|
||||
}
|
||||
|
||||
pub async fn recv(&mut self) -> Result<Request<'_>> {
|
||||
let mut char = self.reader.read_u8().await?;
|
||||
if matches!(self.state, RequestReadState::Start) {
|
||||
self.buffer.clear();
|
||||
self.state = RequestReadState::Header;
|
||||
}
|
||||
if matches!(self.state, RequestReadState::Header) {
|
||||
// Just ignore positive acks
|
||||
while char == b'+' {
|
||||
char = self.reader.read_u8().await?;
|
||||
}
|
||||
if char == b'-' {
|
||||
bail!("no support for negative acks");
|
||||
}
|
||||
if char == 0x03 {
|
||||
// This is how the client "cancels an in-flight request"
|
||||
self.buffer.push(char);
|
||||
self.state = RequestReadState::Start;
|
||||
return Ok(Request {
|
||||
kind: RequestKind::Signal,
|
||||
buffer: &self.buffer,
|
||||
});
|
||||
}
|
||||
if char != b'$' {
|
||||
// Messages are supposed to start with a dollar sign
|
||||
bail!("malformed message");
|
||||
}
|
||||
self.state = RequestReadState::Body {
|
||||
checksum: 0,
|
||||
escaping: false,
|
||||
};
|
||||
char = self.reader.read_u8().await?;
|
||||
}
|
||||
while let RequestReadState::Body { checksum, escaping } = &mut self.state {
|
||||
if char == b'#' && !*escaping {
|
||||
self.state = RequestReadState::Checksum {
|
||||
expected: *checksum,
|
||||
actual: 0,
|
||||
digits: 0,
|
||||
};
|
||||
char = self.reader.read_u8().await?;
|
||||
break;
|
||||
}
|
||||
*checksum = checksum.wrapping_add(char);
|
||||
|
||||
if *escaping {
|
||||
// escaped character
|
||||
self.buffer.push(char ^ 0x20);
|
||||
*escaping = false;
|
||||
} else if char == b'}' {
|
||||
// next character will be escaped
|
||||
*escaping = true;
|
||||
} else {
|
||||
self.buffer.push(char);
|
||||
}
|
||||
char = self.reader.read_u8().await?;
|
||||
}
|
||||
while let RequestReadState::Checksum {
|
||||
expected,
|
||||
actual,
|
||||
digits,
|
||||
} = &mut self.state
|
||||
{
|
||||
let digit = match char {
|
||||
b'0'..=b'9' => char - b'0',
|
||||
b'a'..=b'f' => char - b'a' + 10,
|
||||
b'A'..=b'F' => char - b'A' + 10,
|
||||
_ => bail!("invalid checksum"),
|
||||
};
|
||||
*actual = (*actual << 4) + digit;
|
||||
*digits += 1;
|
||||
if *digits == 2 {
|
||||
if *expected != *actual {
|
||||
bail!("mismatched checksum");
|
||||
}
|
||||
self.state = RequestReadState::Start;
|
||||
return Ok(Request {
|
||||
kind: RequestKind::Command,
|
||||
buffer: &self.buffer,
|
||||
});
|
||||
}
|
||||
char = self.reader.read_u8().await?;
|
||||
}
|
||||
unreachable!();
|
||||
}
|
||||
}
|
||||
|
||||
enum RequestReadState {
|
||||
Start,
|
||||
Header,
|
||||
Body {
|
||||
checksum: u8,
|
||||
escaping: bool,
|
||||
},
|
||||
Checksum {
|
||||
expected: u8,
|
||||
actual: u8,
|
||||
digits: u8,
|
||||
},
|
||||
}
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
use num_traits::ToBytes;
|
||||
|
||||
pub struct Response {
|
||||
buffer: Vec<u8>,
|
||||
checksum: u8,
|
||||
}
|
||||
|
||||
impl Response {
|
||||
pub fn new(mut buffer: Vec<u8>, ack: bool) -> Self {
|
||||
buffer.clear();
|
||||
if ack {
|
||||
buffer.push(b'+');
|
||||
}
|
||||
buffer.push(b'$');
|
||||
Self {
|
||||
buffer,
|
||||
checksum: 0,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn write_str(self, str: &str) -> Self {
|
||||
let mut me = self;
|
||||
for byte in str.as_bytes() {
|
||||
me = me.write_byte(*byte);
|
||||
}
|
||||
me
|
||||
}
|
||||
|
||||
pub fn write_byte(mut self, byte: u8) -> Self {
|
||||
if byte == b'}' || byte == b'#' || byte == b'$' || byte == b'*' {
|
||||
self.buffer.push(b'}');
|
||||
self.checksum = self.checksum.wrapping_add(b'}');
|
||||
let escaped = byte ^ 0x20;
|
||||
self.buffer.push(escaped);
|
||||
self.checksum = self.checksum.wrapping_add(escaped);
|
||||
} else {
|
||||
self.buffer.push(byte);
|
||||
self.checksum = self.checksum.wrapping_add(byte);
|
||||
}
|
||||
self
|
||||
}
|
||||
|
||||
pub fn write_hex<T: ToBytes>(mut self, value: T) -> Self {
|
||||
for byte in value.to_le_bytes().as_ref() {
|
||||
for digit in [(byte >> 4), (byte & 0xf)] {
|
||||
let char = if digit > 9 {
|
||||
b'a' + digit - 10
|
||||
} else {
|
||||
b'0' + digit
|
||||
};
|
||||
self.buffer.push(char);
|
||||
self.checksum = self.checksum.wrapping_add(char);
|
||||
}
|
||||
}
|
||||
self
|
||||
}
|
||||
|
||||
pub fn finish(mut self) -> Vec<u8> {
|
||||
let checksum = self.checksum;
|
||||
self.buffer.push(b'#');
|
||||
self.write_hex(checksum).buffer
|
||||
}
|
||||
}
|
||||
138
src/input.rs
138
src/input.rs
|
|
@ -1,40 +1,16 @@
|
|||
use std::{
|
||||
collections::{hash_map::Entry, HashMap},
|
||||
fmt::Display,
|
||||
str::FromStr,
|
||||
sync::{Arc, RwLock},
|
||||
};
|
||||
|
||||
use anyhow::anyhow;
|
||||
use gilrs::{ev::Code, Axis, Button, Gamepad, GamepadId};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use winit::keyboard::{KeyCode, PhysicalKey};
|
||||
|
||||
use crate::{
|
||||
emulator::{SimId, VBKey},
|
||||
persistence::Persistence,
|
||||
};
|
||||
use crate::emulator::{SimId, VBKey};
|
||||
|
||||
#[derive(Clone, PartialEq, Eq, Hash)]
|
||||
#[derive(Clone, Copy, PartialEq, Eq, Hash)]
|
||||
struct DeviceId(u16, u16);
|
||||
|
||||
impl FromStr for DeviceId {
|
||||
type Err = anyhow::Error;
|
||||
|
||||
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
||||
let mut ids = s.split("-");
|
||||
let vendor_id: u16 = ids.next().ok_or(anyhow!("missing vendor id"))?.parse()?;
|
||||
let product_id: u16 = ids.next().ok_or(anyhow!("missing product id"))?.parse()?;
|
||||
Ok(Self(vendor_id, product_id))
|
||||
}
|
||||
}
|
||||
|
||||
impl Display for DeviceId {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
f.write_fmt(format_args!("{}-{}", self.0, self.1))
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct GamepadInfo {
|
||||
pub id: GamepadId,
|
||||
|
|
@ -50,7 +26,6 @@ pub trait Mappings {
|
|||
fn use_default_mappings(&mut self);
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
pub struct GamepadMapping {
|
||||
buttons: HashMap<Code, VBKey>,
|
||||
axes: HashMap<Code, (VBKey, VBKey)>,
|
||||
|
|
@ -114,30 +89,6 @@ impl GamepadMapping {
|
|||
.or_insert((VBKey::empty(), VBKey::empty()));
|
||||
entry.1 = entry.1.union(key);
|
||||
}
|
||||
|
||||
fn save_mappings(&self) -> PersistedGamepadMapping {
|
||||
fn flatten<V: Copy>(values: &HashMap<Code, V>) -> Vec<(Code, V)> {
|
||||
values.iter().map(|(k, v)| (*k, *v)).collect()
|
||||
}
|
||||
PersistedGamepadMapping {
|
||||
buttons: flatten(&self.buttons),
|
||||
axes: flatten(&self.axes),
|
||||
default_buttons: flatten(&self.default_buttons),
|
||||
default_axes: flatten(&self.default_axes),
|
||||
}
|
||||
}
|
||||
|
||||
fn from_mappings(mappings: &PersistedGamepadMapping) -> Self {
|
||||
fn unflatten<V: Copy>(values: &[(Code, V)]) -> HashMap<Code, V> {
|
||||
values.iter().map(|(k, v)| (*k, *v)).collect()
|
||||
}
|
||||
Self {
|
||||
buttons: unflatten(&mappings.buttons),
|
||||
axes: unflatten(&mappings.axes),
|
||||
default_buttons: unflatten(&mappings.default_buttons),
|
||||
default_axes: unflatten(&mappings.default_axes),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Mappings for GamepadMapping {
|
||||
|
|
@ -207,16 +158,6 @@ impl InputMapping {
|
|||
let entry = self.keys.entry(keyboard_key).or_insert(VBKey::empty());
|
||||
*entry = entry.union(key);
|
||||
}
|
||||
|
||||
fn save_mappings(&self) -> PersistedKeyboardMapping {
|
||||
PersistedKeyboardMapping {
|
||||
keys: self.keys.iter().map(|(k, v)| (*k, *v)).collect(),
|
||||
}
|
||||
}
|
||||
|
||||
fn restore_mappings(&mut self, persisted: &PersistedKeyboardMapping) {
|
||||
self.keys = persisted.keys.iter().map(|(k, v)| (*k, *v)).collect();
|
||||
}
|
||||
}
|
||||
|
||||
impl Mappings for InputMapping {
|
||||
|
|
@ -269,42 +210,25 @@ impl Mappings for InputMapping {
|
|||
|
||||
#[derive(Clone)]
|
||||
pub struct MappingProvider {
|
||||
persistence: Persistence,
|
||||
device_mappings: Arc<RwLock<HashMap<DeviceId, Arc<RwLock<GamepadMapping>>>>>,
|
||||
sim_mappings: HashMap<SimId, Arc<RwLock<InputMapping>>>,
|
||||
gamepad_info: Arc<RwLock<HashMap<GamepadId, GamepadInfo>>>,
|
||||
}
|
||||
|
||||
impl MappingProvider {
|
||||
pub fn new(persistence: Persistence) -> Self {
|
||||
let mut sim_mappings = HashMap::new();
|
||||
let mut device_mappings = HashMap::new();
|
||||
pub fn new() -> Self {
|
||||
let mut mappings = HashMap::new();
|
||||
|
||||
let mut p1_mappings = InputMapping::default();
|
||||
let mut p2_mappings = InputMapping::default();
|
||||
p1_mappings.use_default_mappings();
|
||||
let p2_mappings = InputMapping::default();
|
||||
|
||||
if let Ok(persisted) = persistence.load_config::<PersistedInputMappings>("mappings") {
|
||||
p1_mappings.restore_mappings(&persisted.p1_keyboard);
|
||||
p2_mappings.restore_mappings(&persisted.p2_keyboard);
|
||||
|
||||
for (device_id, mappings) in persisted.gamepads {
|
||||
let Ok(device_id) = device_id.parse::<DeviceId>() else {
|
||||
continue;
|
||||
};
|
||||
let gamepad = GamepadMapping::from_mappings(&mappings);
|
||||
device_mappings.insert(device_id, Arc::new(RwLock::new(gamepad)));
|
||||
}
|
||||
} else {
|
||||
p1_mappings.use_default_mappings();
|
||||
}
|
||||
|
||||
sim_mappings.insert(SimId::Player1, Arc::new(RwLock::new(p1_mappings)));
|
||||
sim_mappings.insert(SimId::Player2, Arc::new(RwLock::new(p2_mappings)));
|
||||
mappings.insert(SimId::Player1, Arc::new(RwLock::new(p1_mappings)));
|
||||
mappings.insert(SimId::Player2, Arc::new(RwLock::new(p2_mappings)));
|
||||
Self {
|
||||
persistence,
|
||||
device_mappings: Arc::new(RwLock::new(device_mappings)),
|
||||
device_mappings: Arc::new(RwLock::new(HashMap::new())),
|
||||
gamepad_info: Arc::new(RwLock::new(HashMap::new())),
|
||||
sim_mappings,
|
||||
sim_mappings: mappings,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -314,7 +238,7 @@ impl MappingProvider {
|
|||
|
||||
pub fn for_gamepad(&self, gamepad_id: GamepadId) -> Option<Arc<RwLock<GamepadMapping>>> {
|
||||
let lock = self.gamepad_info.read().unwrap();
|
||||
let device_id = lock.get(&gamepad_id)?.device_id.clone();
|
||||
let device_id = lock.get(&gamepad_id)?.device_id;
|
||||
drop(lock);
|
||||
let lock = self.device_mappings.read().unwrap();
|
||||
lock.get(&device_id).cloned()
|
||||
|
|
@ -326,7 +250,7 @@ impl MappingProvider {
|
|||
gamepad.product_id().unwrap_or_default(),
|
||||
);
|
||||
let mut lock = self.device_mappings.write().unwrap();
|
||||
let mappings = match lock.entry(device_id.clone()) {
|
||||
let mappings = match lock.entry(device_id) {
|
||||
Entry::Vacant(entry) => {
|
||||
let mappings = GamepadMapping::for_gamepad(gamepad);
|
||||
entry.insert(Arc::new(RwLock::new(mappings)))
|
||||
|
|
@ -379,7 +303,7 @@ impl MappingProvider {
|
|||
return;
|
||||
};
|
||||
info.bound_to = Some(sim_id);
|
||||
let device_id = info.device_id.clone();
|
||||
let device_id = info.device_id;
|
||||
drop(lock);
|
||||
let Some(device_mappings) = self
|
||||
.device_mappings
|
||||
|
|
@ -417,40 +341,4 @@ impl MappingProvider {
|
|||
.cloned()
|
||||
.collect()
|
||||
}
|
||||
|
||||
pub fn save(&self) {
|
||||
let p1_keyboard = self.for_sim(SimId::Player1).read().unwrap().save_mappings();
|
||||
let p2_keyboard = self.for_sim(SimId::Player2).read().unwrap().save_mappings();
|
||||
let mut gamepads = HashMap::new();
|
||||
for (device_id, gamepad) in self.device_mappings.read().unwrap().iter() {
|
||||
let mapping = gamepad.read().unwrap().save_mappings();
|
||||
gamepads.insert(device_id.to_string(), mapping);
|
||||
}
|
||||
let persisted = PersistedInputMappings {
|
||||
p1_keyboard,
|
||||
p2_keyboard,
|
||||
gamepads,
|
||||
};
|
||||
let _ = self.persistence.save_config("mappings", &persisted);
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct PersistedInputMappings {
|
||||
p1_keyboard: PersistedKeyboardMapping,
|
||||
p2_keyboard: PersistedKeyboardMapping,
|
||||
gamepads: HashMap<String, PersistedGamepadMapping>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct PersistedKeyboardMapping {
|
||||
keys: Vec<(PhysicalKey, VBKey)>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct PersistedGamepadMapping {
|
||||
buttons: Vec<(Code, VBKey)>,
|
||||
axes: Vec<(Code, (VBKey, VBKey))>,
|
||||
default_buttons: Vec<(Code, VBKey)>,
|
||||
default_axes: Vec<(Code, (VBKey, VBKey))>,
|
||||
}
|
||||
|
|
|
|||
79
src/main.rs
79
src/main.rs
|
|
@ -1,78 +1,23 @@
|
|||
// hide console in release mode
|
||||
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
|
||||
use std::{path::PathBuf, process};
|
||||
|
||||
use std::{path::PathBuf, process, time::SystemTime};
|
||||
|
||||
use anyhow::{bail, Result};
|
||||
use anyhow::Result;
|
||||
use app::Application;
|
||||
use clap::Parser;
|
||||
use emulator::EmulatorBuilder;
|
||||
use thread_priority::{ThreadBuilder, ThreadPriority};
|
||||
use tracing::error;
|
||||
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer};
|
||||
use winit::event_loop::{ControlFlow, EventLoop};
|
||||
|
||||
mod app;
|
||||
mod audio;
|
||||
mod controller;
|
||||
mod emulator;
|
||||
mod gdbserver;
|
||||
mod graphics;
|
||||
mod input;
|
||||
mod persistence;
|
||||
mod window;
|
||||
|
||||
#[derive(Parser)]
|
||||
struct Args {
|
||||
/// The path to a virtual boy ROM to run.
|
||||
rom: Option<PathBuf>,
|
||||
/// Start a GDB/LLDB debug server on this port.
|
||||
#[arg(short, long)]
|
||||
debug_port: Option<u16>,
|
||||
}
|
||||
|
||||
fn init_logger() {
|
||||
let directives = std::env::var("RUST_LOG").unwrap_or("error,lemur=info".into());
|
||||
let filter = EnvFilter::builder().parse_lossy(directives);
|
||||
let layer = tracing_subscriber::fmt::layer().with_filter(filter);
|
||||
tracing_subscriber::registry().with(layer).init();
|
||||
}
|
||||
|
||||
fn set_panic_handler() {
|
||||
std::panic::set_hook(Box::new(|info| {
|
||||
let mut message = String::new();
|
||||
if let Some(msg) = info.payload().downcast_ref::<&str>() {
|
||||
message += &format!("{}\n", msg);
|
||||
} else if let Some(msg) = info.payload().downcast_ref::<String>() {
|
||||
message += &format!("{}\n", msg);
|
||||
}
|
||||
if let Some(location) = info.location() {
|
||||
message += &format!(
|
||||
" in file '{}' at line {}\n",
|
||||
location.file(),
|
||||
location.line()
|
||||
);
|
||||
}
|
||||
let backtrace = std::backtrace::Backtrace::force_capture();
|
||||
message += &format!("stack trace:\n{:#}\n", backtrace);
|
||||
|
||||
eprint!("{}", message);
|
||||
|
||||
let Some(project_dirs) = directories::ProjectDirs::from("com", "virtual-boy", "Lemur")
|
||||
else {
|
||||
return;
|
||||
};
|
||||
let data_dir = project_dirs.data_dir();
|
||||
if std::fs::create_dir_all(data_dir).is_err() {
|
||||
return;
|
||||
}
|
||||
let timestamp = SystemTime::now()
|
||||
.duration_since(SystemTime::UNIX_EPOCH)
|
||||
.unwrap()
|
||||
.as_millis();
|
||||
let logfile_name = format!("crash-{}.txt", timestamp);
|
||||
let _ = std::fs::write(data_dir.join(logfile_name), message);
|
||||
}));
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
|
|
@ -85,24 +30,14 @@ fn set_process_priority_to_high() -> Result<()> {
|
|||
}
|
||||
|
||||
fn main() -> Result<()> {
|
||||
init_logger();
|
||||
|
||||
set_panic_handler();
|
||||
|
||||
#[cfg(windows)]
|
||||
set_process_priority_to_high()?;
|
||||
|
||||
let args = Args::parse();
|
||||
|
||||
let (mut builder, client) = EmulatorBuilder::new();
|
||||
if let Some(path) = &args.rom {
|
||||
builder = builder.with_rom(path);
|
||||
}
|
||||
if args.debug_port.is_some() {
|
||||
if args.rom.is_none() {
|
||||
bail!("to start debugging, please select a game.");
|
||||
}
|
||||
builder = builder.start_paused(true);
|
||||
if let Some(path) = args.rom {
|
||||
builder = builder.with_rom(&path);
|
||||
}
|
||||
|
||||
ThreadBuilder::default()
|
||||
|
|
@ -111,8 +46,8 @@ fn main() -> Result<()> {
|
|||
.spawn_careless(move || {
|
||||
let mut emulator = match builder.build() {
|
||||
Ok(e) => e,
|
||||
Err(error) => {
|
||||
error!(%error, "Error initializing emulator");
|
||||
Err(err) => {
|
||||
eprintln!("Error initializing emulator: {err}");
|
||||
process::exit(1);
|
||||
}
|
||||
};
|
||||
|
|
@ -122,6 +57,6 @@ fn main() -> Result<()> {
|
|||
let event_loop = EventLoop::with_user_event().build().unwrap();
|
||||
event_loop.set_control_flow(ControlFlow::Poll);
|
||||
let proxy = event_loop.create_proxy();
|
||||
event_loop.run_app(&mut Application::new(client, proxy, args.debug_port))?;
|
||||
event_loop.run_app(&mut Application::new(client, proxy))?;
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
use std::{fs, path::PathBuf};
|
||||
|
||||
use anyhow::{bail, Result};
|
||||
use directories::ProjectDirs;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct Persistence {
|
||||
dirs: Option<Dirs>,
|
||||
}
|
||||
|
||||
impl Persistence {
|
||||
pub fn new() -> Self {
|
||||
Self { dirs: init_dirs() }
|
||||
}
|
||||
|
||||
pub fn save_config<T: Serialize>(&self, file: &str, data: &T) -> Result<()> {
|
||||
if let Some(dirs) = self.dirs.as_ref() {
|
||||
let bytes = serde_json::to_vec_pretty(data)?;
|
||||
let filename = dirs.config_dir.join(file).with_extension("json");
|
||||
fs::write(&filename, bytes)?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn load_config<T: for<'a> Deserialize<'a>>(&self, file: &str) -> Result<T> {
|
||||
let Some(dirs) = self.dirs.as_ref() else {
|
||||
bail!("config directory not found");
|
||||
};
|
||||
let filename = dirs.config_dir.join(file).with_extension("json");
|
||||
let bytes = fs::read(filename)?;
|
||||
Ok(serde_json::from_slice(&bytes)?)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
struct Dirs {
|
||||
config_dir: PathBuf,
|
||||
}
|
||||
|
||||
fn init_dirs() -> Option<Dirs> {
|
||||
let dirs = ProjectDirs::from("com", "virtual-boy", "Lemur")?;
|
||||
let config_dir = dirs.config_dir().to_path_buf();
|
||||
fs::create_dir_all(&config_dir).ok()?;
|
||||
Some(Dirs { config_dir })
|
||||
}
|
||||
|
|
@ -1,23 +1,14 @@
|
|||
pub use about::AboutWindow;
|
||||
use egui::{Context, ViewportBuilder, ViewportId};
|
||||
pub use game::GameWindow;
|
||||
pub use gdb::GdbServerWindow;
|
||||
pub use input::InputWindow;
|
||||
use winit::event::KeyEvent;
|
||||
|
||||
use crate::emulator::SimId;
|
||||
|
||||
mod about;
|
||||
mod game;
|
||||
mod game_screen;
|
||||
mod gdb;
|
||||
mod input;
|
||||
|
||||
pub trait AppWindow {
|
||||
fn viewport_id(&self) -> ViewportId;
|
||||
fn sim_id(&self) -> SimId {
|
||||
SimId::Player1
|
||||
}
|
||||
fn initial_viewport(&self) -> ViewportBuilder;
|
||||
fn show(&mut self, ctx: &Context);
|
||||
fn on_init(&mut self, render_state: &egui_wgpu::RenderState) {
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
use egui::{CentralPanel, Context, Image, ViewportBuilder, ViewportId};
|
||||
|
||||
use super::AppWindow;
|
||||
|
||||
pub struct AboutWindow;
|
||||
|
||||
impl AppWindow for AboutWindow {
|
||||
fn viewport_id(&self) -> ViewportId {
|
||||
ViewportId::from_hash_of("About")
|
||||
}
|
||||
|
||||
fn initial_viewport(&self) -> ViewportBuilder {
|
||||
ViewportBuilder::default()
|
||||
.with_title("About Lemur")
|
||||
.with_inner_size((300.0, 200.0))
|
||||
}
|
||||
|
||||
fn show(&mut self, ctx: &Context) {
|
||||
CentralPanel::default().show(ctx, |ui| {
|
||||
ui.vertical_centered(|ui| {
|
||||
ui.label("Lemur Virtual Boy Emulator");
|
||||
ui.label(format!("Version {}", env!("CARGO_PKG_VERSION")));
|
||||
ui.hyperlink("https://git.virtual-boy.com/PVB/lemur");
|
||||
let logo = Image::new(egui::include_image!("../../assets/lemur-256x256.png"))
|
||||
.max_width(256.0)
|
||||
.maintain_aspect_ratio(true);
|
||||
ui.add(logo);
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -1,67 +1,29 @@
|
|||
use std::sync::mpsc;
|
||||
|
||||
use crate::{
|
||||
app::UserEvent,
|
||||
emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId, SimState},
|
||||
persistence::Persistence,
|
||||
emulator::{EmulatorClient, EmulatorCommand, SimId},
|
||||
};
|
||||
use egui::{
|
||||
ecolor::HexColor, menu, Align2, Button, CentralPanel, Color32, Context, Direction, Frame,
|
||||
Layout, Response, Sense, TopBottomPanel, Ui, Vec2, ViewportBuilder, ViewportCommand,
|
||||
ViewportId, WidgetText, Window,
|
||||
menu, Button, CentralPanel, Color32, Context, Frame, Response, TopBottomPanel, Ui,
|
||||
ViewportBuilder, ViewportCommand, ViewportId, WidgetText,
|
||||
};
|
||||
use egui_toast::{Toast, Toasts};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use winit::event_loop::EventLoopProxy;
|
||||
|
||||
use super::{
|
||||
game_screen::{DisplayMode, GameScreen},
|
||||
AppWindow,
|
||||
};
|
||||
|
||||
const COLOR_PRESETS: [[Color32; 2]; 3] = [
|
||||
[
|
||||
Color32::from_rgb(0xff, 0x00, 0x00),
|
||||
Color32::from_rgb(0x00, 0xc6, 0xf0),
|
||||
],
|
||||
[
|
||||
Color32::from_rgb(0x00, 0xb4, 0x00),
|
||||
Color32::from_rgb(0xc8, 0x00, 0xff),
|
||||
],
|
||||
[
|
||||
Color32::from_rgb(0xb4, 0x9b, 0x00),
|
||||
Color32::from_rgb(0x00, 0x00, 0xff),
|
||||
],
|
||||
];
|
||||
use super::{game_screen::GameScreen, AppWindow};
|
||||
|
||||
pub struct GameWindow {
|
||||
client: EmulatorClient,
|
||||
proxy: EventLoopProxy<UserEvent>,
|
||||
persistence: Persistence,
|
||||
sim_id: SimId,
|
||||
config: GameConfig,
|
||||
screen: Option<GameScreen>,
|
||||
messages: Option<mpsc::Receiver<Toast>>,
|
||||
color_picker: Option<ColorPickerState>,
|
||||
}
|
||||
|
||||
impl GameWindow {
|
||||
pub fn new(
|
||||
client: EmulatorClient,
|
||||
proxy: EventLoopProxy<UserEvent>,
|
||||
persistence: Persistence,
|
||||
sim_id: SimId,
|
||||
) -> Self {
|
||||
let config = load_config(&persistence, sim_id);
|
||||
pub fn new(client: EmulatorClient, proxy: EventLoopProxy<UserEvent>, sim_id: SimId) -> Self {
|
||||
Self {
|
||||
client,
|
||||
proxy,
|
||||
persistence,
|
||||
sim_id,
|
||||
config,
|
||||
screen: None,
|
||||
messages: None,
|
||||
color_picker: None,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -73,161 +35,47 @@ impl GameWindow {
|
|||
.pick_file();
|
||||
if let Some(path) = rom {
|
||||
self.client
|
||||
.send_command(EmulatorCommand::LoadGame(self.sim_id, path));
|
||||
.send_command(EmulatorCommand::LoadGame(SimId::Player1, path));
|
||||
}
|
||||
ui.close_menu();
|
||||
}
|
||||
if ui.button("Quit").clicked() {
|
||||
let _ = self.proxy.send_event(UserEvent::Quit(self.sim_id));
|
||||
ctx.send_viewport_cmd(ViewportCommand::Close);
|
||||
}
|
||||
});
|
||||
ui.menu_button("Emulation", |ui| {
|
||||
let state = self.client.emulator_state();
|
||||
let is_ready = self.client.sim_state(self.sim_id) == SimState::Ready;
|
||||
let can_pause = is_ready && state == EmulatorState::Running;
|
||||
let can_resume = is_ready && state == EmulatorState::Paused;
|
||||
if state == EmulatorState::Running {
|
||||
if ui.add_enabled(can_pause, Button::new("Pause")).clicked() {
|
||||
let has_game = self.client.has_game(self.sim_id);
|
||||
if self.client.is_running(self.sim_id) {
|
||||
if ui.add_enabled(has_game, Button::new("Pause")).clicked() {
|
||||
self.client.send_command(EmulatorCommand::Pause);
|
||||
ui.close_menu();
|
||||
}
|
||||
} else if ui.add_enabled(can_resume, Button::new("Resume")).clicked() {
|
||||
} else if ui.add_enabled(has_game, Button::new("Resume")).clicked() {
|
||||
self.client.send_command(EmulatorCommand::Resume);
|
||||
ui.close_menu();
|
||||
}
|
||||
if ui.add_enabled(is_ready, Button::new("Reset")).clicked() {
|
||||
if ui.add_enabled(has_game, Button::new("Reset")).clicked() {
|
||||
self.client
|
||||
.send_command(EmulatorCommand::Reset(self.sim_id));
|
||||
ui.close_menu();
|
||||
}
|
||||
});
|
||||
ui.menu_button("Options", |ui| self.show_options_menu(ctx, ui));
|
||||
ui.menu_button("Multiplayer", |ui| {
|
||||
let has_player_2 = self.client.sim_state(SimId::Player2) != SimState::Uninitialized;
|
||||
if self.sim_id == SimId::Player1
|
||||
&& !has_player_2
|
||||
&& ui.button("Open Player 2").clicked()
|
||||
{
|
||||
self.client
|
||||
.send_command(EmulatorCommand::StartSecondSim(None));
|
||||
self.proxy.send_event(UserEvent::OpenPlayer2).unwrap();
|
||||
ui.close_menu();
|
||||
}
|
||||
if has_player_2 {
|
||||
let linked = self.client.are_sims_linked();
|
||||
if linked && ui.button("Unlink").clicked() {
|
||||
self.client.send_command(EmulatorCommand::Unlink);
|
||||
ui.close_menu();
|
||||
}
|
||||
if !linked && ui.button("Link").clicked() {
|
||||
self.client.send_command(EmulatorCommand::Link);
|
||||
ui.close_menu();
|
||||
}
|
||||
}
|
||||
});
|
||||
ui.menu_button("Tools", |ui| {
|
||||
if ui.button("GDB Server").clicked() {
|
||||
self.proxy
|
||||
.send_event(UserEvent::OpenDebugger(self.sim_id))
|
||||
.unwrap();
|
||||
ui.close_menu();
|
||||
}
|
||||
});
|
||||
ui.menu_button("About", |ui| {
|
||||
self.proxy.send_event(UserEvent::OpenAbout).unwrap();
|
||||
ui.close_menu();
|
||||
});
|
||||
}
|
||||
|
||||
fn show_options_menu(&mut self, ctx: &Context, ui: &mut Ui) {
|
||||
ui.menu_button("Video", |ui| {
|
||||
ui.menu_button("Screen Size", |ui| {
|
||||
let current_dims = ctx.input(|i| i.viewport().inner_rect.unwrap());
|
||||
let current_dims = current_dims.max - current_dims.min;
|
||||
let current_dims = ctx.input(|i| i.viewport().inner_rect.unwrap());
|
||||
let current_dims = current_dims.max - current_dims.min;
|
||||
|
||||
for scale in 1..=4 {
|
||||
let label = format!("x{scale}");
|
||||
let scale = scale as f32;
|
||||
let dims = {
|
||||
let Vec2 { x, y } = self.config.display_mode.proportions();
|
||||
Vec2::new(x * scale, y * scale + 22.0)
|
||||
};
|
||||
if ui
|
||||
.selectable_button((current_dims - dims).length() < 1.0, label)
|
||||
.clicked()
|
||||
{
|
||||
ctx.send_viewport_cmd(ViewportCommand::InnerSize(dims));
|
||||
ui.close_menu();
|
||||
}
|
||||
for scale in 1..=4 {
|
||||
let label = format!("x{scale}");
|
||||
let scale = scale as f32;
|
||||
let dims = (384.0 * scale, 224.0 * scale + 22.0).into();
|
||||
if ui
|
||||
.selectable_button((current_dims - dims).length() < 1.0, label)
|
||||
.clicked()
|
||||
{
|
||||
ctx.send_viewport_cmd(ViewportCommand::InnerSize(dims));
|
||||
ui.close_menu();
|
||||
}
|
||||
});
|
||||
|
||||
ui.menu_button("Display Mode", |ui| {
|
||||
let old_proportions = self.config.display_mode.proportions();
|
||||
let mut changed = false;
|
||||
let mut display_mode = self.config.display_mode;
|
||||
changed |= ui
|
||||
.selectable_option(&mut display_mode, DisplayMode::Anaglyph, "Anaglyph")
|
||||
.clicked();
|
||||
changed |= ui
|
||||
.selectable_option(&mut display_mode, DisplayMode::LeftEye, "Left Eye")
|
||||
.clicked();
|
||||
changed |= ui
|
||||
.selectable_option(&mut display_mode, DisplayMode::RightEye, "Right Eye")
|
||||
.clicked();
|
||||
changed |= ui
|
||||
.selectable_option(&mut display_mode, DisplayMode::SideBySide, "Side by Side")
|
||||
.clicked();
|
||||
|
||||
if !changed {
|
||||
return;
|
||||
}
|
||||
|
||||
let current_dims = {
|
||||
let viewport = ctx.input(|i| i.viewport().inner_rect.unwrap());
|
||||
viewport.max - viewport.min
|
||||
};
|
||||
let new_proportions = display_mode.proportions();
|
||||
let scale = new_proportions / old_proportions;
|
||||
if scale != Vec2::new(1.0, 1.0) {
|
||||
ctx.send_viewport_cmd(ViewportCommand::InnerSize(current_dims * scale));
|
||||
}
|
||||
|
||||
self.update_config(|c| {
|
||||
c.display_mode = display_mode;
|
||||
c.dimensions = current_dims * scale;
|
||||
});
|
||||
ui.close_menu();
|
||||
});
|
||||
ui.menu_button("Colors", |ui| {
|
||||
for preset in COLOR_PRESETS {
|
||||
if ui.color_pair_button(preset[0], preset[1]).clicked() {
|
||||
self.update_config(|c| c.colors = preset);
|
||||
ui.close_menu();
|
||||
}
|
||||
}
|
||||
ui.with_layout(ui.layout().with_cross_align(egui::Align::Center), |ui| {
|
||||
if ui.button("Custom").clicked() {
|
||||
let color_str = |color: Color32| {
|
||||
format!("{:02x}{:02x}{:02x}", color.r(), color.g(), color.b())
|
||||
};
|
||||
let is_running = self.client.emulator_state() == EmulatorState::Running;
|
||||
if is_running {
|
||||
self.client.send_command(EmulatorCommand::Pause);
|
||||
}
|
||||
let color_codes = [
|
||||
color_str(self.config.colors[0]),
|
||||
color_str(self.config.colors[1]),
|
||||
];
|
||||
self.color_picker = Some(ColorPickerState {
|
||||
color_codes,
|
||||
just_opened: true,
|
||||
unpause_on_close: is_running,
|
||||
});
|
||||
ui.close_menu();
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
ui.menu_button("Audio", |ui| {
|
||||
let p1_enabled = self.client.is_audio_enabled(SimId::Player1);
|
||||
|
|
@ -249,64 +97,28 @@ impl GameWindow {
|
|||
ui.close_menu();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
fn show_color_picker(&mut self, ui: &mut Ui) {
|
||||
let mut colors = self.config.colors;
|
||||
let Some(state) = self.color_picker.as_mut() else {
|
||||
return;
|
||||
};
|
||||
let (open, updated) = ui
|
||||
.horizontal(|ui| {
|
||||
let left_color = ui.color_picker(&mut colors[0], &mut state.color_codes[0]);
|
||||
if state.just_opened {
|
||||
left_color.request_focus();
|
||||
state.just_opened = false;
|
||||
}
|
||||
let right_color = ui.color_picker(&mut colors[1], &mut state.color_codes[1]);
|
||||
let open = left_color.has_focus() || right_color.has_focus();
|
||||
let updated = left_color.changed() || right_color.changed();
|
||||
(open, updated)
|
||||
})
|
||||
.inner;
|
||||
if !open {
|
||||
if state.unpause_on_close {
|
||||
self.client.send_command(EmulatorCommand::Resume);
|
||||
ui.menu_button("Multiplayer", |ui| {
|
||||
if self.sim_id == SimId::Player1
|
||||
&& !self.client.has_player_2()
|
||||
&& ui.button("Open Player 2").clicked()
|
||||
{
|
||||
self.client
|
||||
.send_command(EmulatorCommand::StartSecondSim(None));
|
||||
self.proxy.send_event(UserEvent::OpenPlayer2).unwrap();
|
||||
ui.close_menu();
|
||||
}
|
||||
self.color_picker = None;
|
||||
}
|
||||
if updated {
|
||||
self.update_config(|c| c.colors = colors);
|
||||
}
|
||||
}
|
||||
|
||||
fn update_config(&mut self, update: impl FnOnce(&mut GameConfig)) {
|
||||
let mut new_config = self.config.clone();
|
||||
update(&mut new_config);
|
||||
if self.config != new_config {
|
||||
let _ = self
|
||||
.persistence
|
||||
.save_config(config_filename(self.sim_id), &new_config);
|
||||
}
|
||||
self.config = new_config;
|
||||
}
|
||||
}
|
||||
|
||||
fn config_filename(sim_id: SimId) -> &'static str {
|
||||
match sim_id {
|
||||
SimId::Player1 => "config_p1",
|
||||
SimId::Player2 => "config_p2",
|
||||
}
|
||||
}
|
||||
|
||||
fn load_config(persistence: &Persistence, sim_id: SimId) -> GameConfig {
|
||||
if let Ok(config) = persistence.load_config(config_filename(sim_id)) {
|
||||
return config;
|
||||
}
|
||||
GameConfig {
|
||||
display_mode: DisplayMode::Anaglyph,
|
||||
colors: COLOR_PRESETS[0],
|
||||
dimensions: DisplayMode::Anaglyph.proportions() + Vec2::new(0.0, 22.0),
|
||||
if self.client.has_player_2() {
|
||||
let linked = self.client.are_sims_linked();
|
||||
if linked && ui.button("Unlink").clicked() {
|
||||
self.client.send_command(EmulatorCommand::Unlink);
|
||||
ui.close_menu();
|
||||
}
|
||||
if !linked && ui.button("Link").clicked() {
|
||||
self.client.send_command(EmulatorCommand::Link);
|
||||
ui.close_menu();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -318,31 +130,13 @@ impl AppWindow for GameWindow {
|
|||
}
|
||||
}
|
||||
|
||||
fn sim_id(&self) -> SimId {
|
||||
self.sim_id
|
||||
}
|
||||
|
||||
fn initial_viewport(&self) -> ViewportBuilder {
|
||||
ViewportBuilder::default()
|
||||
.with_title("Lemur")
|
||||
.with_inner_size(self.config.dimensions)
|
||||
.with_title("Shrooms VB")
|
||||
.with_inner_size((384.0, 246.0))
|
||||
}
|
||||
|
||||
fn show(&mut self, ctx: &Context) {
|
||||
let dimensions = {
|
||||
let bounds = ctx.input(|i| i.viewport().inner_rect.unwrap());
|
||||
bounds.max - bounds.min
|
||||
};
|
||||
self.update_config(|c| c.dimensions = dimensions);
|
||||
|
||||
let mut toasts = Toasts::new()
|
||||
.anchor(Align2::LEFT_BOTTOM, (10.0, 10.0))
|
||||
.direction(Direction::BottomUp);
|
||||
if let Some(messages) = self.messages.as_mut() {
|
||||
while let Ok(toast) = messages.try_recv() {
|
||||
toasts.add(toast);
|
||||
}
|
||||
}
|
||||
TopBottomPanel::top("menubar")
|
||||
.exact_height(22.0)
|
||||
.show(ctx, |ui| {
|
||||
|
|
@ -350,63 +144,30 @@ impl AppWindow for GameWindow {
|
|||
self.show_menu(ctx, ui);
|
||||
});
|
||||
});
|
||||
if self.color_picker.is_some() {
|
||||
Window::new("Color Picker")
|
||||
.title_bar(false)
|
||||
.resizable(false)
|
||||
.anchor(Align2::CENTER_CENTER, Vec2::ZERO)
|
||||
.show(ctx, |ui| {
|
||||
self.show_color_picker(ui);
|
||||
});
|
||||
}
|
||||
let frame = Frame::central_panel(&ctx.style()).fill(Color32::BLACK);
|
||||
CentralPanel::default().frame(frame).show(ctx, |ui| {
|
||||
if let Some(screen) = self.screen.as_mut() {
|
||||
screen.update(self.config.display_mode, self.config.colors);
|
||||
if let Some(screen) = self.screen.as_ref() {
|
||||
ui.add(screen);
|
||||
}
|
||||
});
|
||||
toasts.show(ctx);
|
||||
}
|
||||
|
||||
fn on_init(&mut self, render_state: &egui_wgpu::RenderState) {
|
||||
let (screen, sink) = GameScreen::init(render_state);
|
||||
let (message_sink, message_source) = mpsc::channel();
|
||||
self.client.send_command(EmulatorCommand::ConnectToSim(
|
||||
self.sim_id,
|
||||
sink,
|
||||
message_sink,
|
||||
));
|
||||
self.screen = Some(screen);
|
||||
self.messages = Some(message_source);
|
||||
self.client
|
||||
.send_command(EmulatorCommand::SetRenderer(self.sim_id, sink));
|
||||
self.screen = Some(screen)
|
||||
}
|
||||
|
||||
fn on_destroy(&mut self) {
|
||||
if self.sim_id == SimId::Player2 {
|
||||
self.client.send_command(EmulatorCommand::StopSecondSim);
|
||||
}
|
||||
let _ = self.proxy.send_event(UserEvent::Quit(self.sim_id));
|
||||
}
|
||||
}
|
||||
|
||||
trait UiExt {
|
||||
fn selectable_button(&mut self, selected: bool, text: impl Into<WidgetText>) -> Response;
|
||||
fn selectable_option<T: Eq>(
|
||||
&mut self,
|
||||
current_value: &mut T,
|
||||
selected_value: T,
|
||||
text: impl Into<WidgetText>,
|
||||
) -> Response {
|
||||
let response = self.selectable_button(*current_value == selected_value, text);
|
||||
if response.clicked() {
|
||||
*current_value = selected_value;
|
||||
}
|
||||
response
|
||||
}
|
||||
|
||||
fn color_pair_button(&mut self, left: Color32, right: Color32) -> Response;
|
||||
|
||||
fn color_picker(&mut self, color: &mut Color32, hex: &mut String) -> Response;
|
||||
}
|
||||
|
||||
impl UiExt for Ui {
|
||||
|
|
@ -417,50 +178,4 @@ impl UiExt for Ui {
|
|||
let mut selected = selected;
|
||||
self.checkbox(&mut selected, text)
|
||||
}
|
||||
|
||||
fn color_pair_button(&mut self, left: Color32, right: Color32) -> Response {
|
||||
let button_size = Vec2::new(60.0, 20.0);
|
||||
let (rect, response) = self.allocate_at_least(button_size, Sense::click());
|
||||
let center_x = rect.center().x;
|
||||
let left_rect = rect.with_max_x(center_x);
|
||||
self.painter().rect_filled(left_rect, 0.0, left);
|
||||
let right_rect = rect.with_min_x(center_x);
|
||||
self.painter().rect_filled(right_rect, 0.0, right);
|
||||
|
||||
let style = self.style().interact(&response);
|
||||
self.painter().rect_stroke(rect, 0.0, style.fg_stroke);
|
||||
response
|
||||
}
|
||||
|
||||
fn color_picker(&mut self, color: &mut Color32, hex: &mut String) -> Response {
|
||||
self.allocate_ui_with_layout(
|
||||
Vec2::new(100.0, 130.0),
|
||||
Layout::top_down_justified(egui::Align::Center),
|
||||
|ui| {
|
||||
let (rect, _) = ui.allocate_at_least(Vec2::new(100.0, 100.0), Sense::hover());
|
||||
ui.painter().rect_filled(rect, 0.0, *color);
|
||||
let resp = ui.text_edit_singleline(hex);
|
||||
if resp.changed() {
|
||||
if let Ok(new_color) = HexColor::from_str_without_hash(hex) {
|
||||
*color = new_color.color();
|
||||
}
|
||||
}
|
||||
resp
|
||||
},
|
||||
)
|
||||
.inner
|
||||
}
|
||||
}
|
||||
|
||||
struct ColorPickerState {
|
||||
color_codes: [String; 2],
|
||||
just_opened: bool,
|
||||
unpause_on_close: bool,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Clone, PartialEq, Eq)]
|
||||
struct GameConfig {
|
||||
display_mode: DisplayMode,
|
||||
colors: [Color32; 2],
|
||||
dimensions: Vec2,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,12 @@
|
|||
use std::{collections::HashMap, sync::Arc};
|
||||
use std::sync::Arc;
|
||||
|
||||
use egui::{Color32, Rgba, Vec2, Widget};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use wgpu::{util::DeviceExt as _, BindGroup, BindGroupLayout, Buffer, RenderPipeline};
|
||||
use egui::Widget;
|
||||
use wgpu::{util::DeviceExt as _, BindGroup, BindGroupLayout, RenderPipeline};
|
||||
|
||||
use crate::graphics::TextureSink;
|
||||
|
||||
pub struct GameScreen {
|
||||
bind_group: Arc<BindGroup>,
|
||||
color_buffer: Arc<Buffer>,
|
||||
display_mode: DisplayMode,
|
||||
colors: Colors,
|
||||
}
|
||||
|
||||
impl GameScreen {
|
||||
|
|
@ -49,69 +45,57 @@ impl GameScreen {
|
|||
],
|
||||
});
|
||||
|
||||
let shader = device.create_shader_module(wgpu::include_wgsl!("../game.wgsl"));
|
||||
let shader = device.create_shader_module(wgpu::include_wgsl!("../anaglyph.wgsl"));
|
||||
let render_pipeline_layout =
|
||||
device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
|
||||
label: Some("render pipeline layout"),
|
||||
bind_group_layouts: &[&bind_group_layout],
|
||||
push_constant_ranges: &[],
|
||||
});
|
||||
|
||||
let create_render_pipeline = |entry_point: &str| {
|
||||
device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
|
||||
label: Some("render pipeline"),
|
||||
layout: Some(&render_pipeline_layout),
|
||||
vertex: wgpu::VertexState {
|
||||
module: &shader,
|
||||
entry_point: Some("vs_main"),
|
||||
buffers: &[],
|
||||
compilation_options: wgpu::PipelineCompilationOptions::default(),
|
||||
},
|
||||
fragment: Some(wgpu::FragmentState {
|
||||
module: &shader,
|
||||
entry_point: Some(entry_point),
|
||||
targets: &[Some(wgpu::ColorTargetState {
|
||||
format: wgpu::TextureFormat::Bgra8Unorm,
|
||||
blend: Some(wgpu::BlendState::REPLACE),
|
||||
write_mask: wgpu::ColorWrites::ALL,
|
||||
})],
|
||||
compilation_options: wgpu::PipelineCompilationOptions::default(),
|
||||
}),
|
||||
primitive: wgpu::PrimitiveState {
|
||||
topology: wgpu::PrimitiveTopology::TriangleList,
|
||||
strip_index_format: None,
|
||||
front_face: wgpu::FrontFace::Ccw,
|
||||
cull_mode: Some(wgpu::Face::Back),
|
||||
polygon_mode: wgpu::PolygonMode::Fill,
|
||||
unclipped_depth: false,
|
||||
conservative: false,
|
||||
},
|
||||
depth_stencil: None,
|
||||
multisample: wgpu::MultisampleState {
|
||||
count: 1,
|
||||
mask: !0,
|
||||
alpha_to_coverage_enabled: false,
|
||||
},
|
||||
multiview: None,
|
||||
cache: None,
|
||||
})
|
||||
};
|
||||
|
||||
let mut render_pipelines = HashMap::new();
|
||||
render_pipelines.insert(DisplayMode::Anaglyph, create_render_pipeline("fs_anaglyph"));
|
||||
render_pipelines.insert(DisplayMode::LeftEye, create_render_pipeline("fs_lefteye"));
|
||||
render_pipelines.insert(DisplayMode::RightEye, create_render_pipeline("fs_righteye"));
|
||||
render_pipelines.insert(
|
||||
DisplayMode::SideBySide,
|
||||
create_render_pipeline("fs_sidebyside"),
|
||||
);
|
||||
let render_pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
|
||||
label: Some("render pipeline"),
|
||||
layout: Some(&render_pipeline_layout),
|
||||
vertex: wgpu::VertexState {
|
||||
module: &shader,
|
||||
entry_point: "vs_main",
|
||||
buffers: &[],
|
||||
compilation_options: wgpu::PipelineCompilationOptions::default(),
|
||||
},
|
||||
fragment: Some(wgpu::FragmentState {
|
||||
module: &shader,
|
||||
entry_point: "fs_main",
|
||||
targets: &[Some(wgpu::ColorTargetState {
|
||||
format: wgpu::TextureFormat::Bgra8Unorm,
|
||||
blend: Some(wgpu::BlendState::REPLACE),
|
||||
write_mask: wgpu::ColorWrites::ALL,
|
||||
})],
|
||||
compilation_options: wgpu::PipelineCompilationOptions::default(),
|
||||
}),
|
||||
primitive: wgpu::PrimitiveState {
|
||||
topology: wgpu::PrimitiveTopology::TriangleList,
|
||||
strip_index_format: None,
|
||||
front_face: wgpu::FrontFace::Ccw,
|
||||
cull_mode: Some(wgpu::Face::Back),
|
||||
polygon_mode: wgpu::PolygonMode::Fill,
|
||||
unclipped_depth: false,
|
||||
conservative: false,
|
||||
},
|
||||
depth_stencil: None,
|
||||
multisample: wgpu::MultisampleState {
|
||||
count: 1,
|
||||
mask: !0,
|
||||
alpha_to_coverage_enabled: false,
|
||||
},
|
||||
multiview: None,
|
||||
cache: None,
|
||||
});
|
||||
|
||||
render_state
|
||||
.renderer
|
||||
.write()
|
||||
.callback_resources
|
||||
.insert(SharedGameScreenResources {
|
||||
render_pipelines,
|
||||
pipeline: render_pipeline,
|
||||
bind_group_layout,
|
||||
});
|
||||
}
|
||||
|
|
@ -124,12 +108,12 @@ impl GameScreen {
|
|||
|
||||
let (sink, texture_view) = TextureSink::new(device, queue.clone());
|
||||
let sampler = device.create_sampler(&wgpu::SamplerDescriptor::default());
|
||||
let colors = Colors::new(
|
||||
Color32::from_rgb(0xff, 0x00, 0x00),
|
||||
Color32::from_rgb(0x00, 0xc6, 0xf0),
|
||||
);
|
||||
let colors = Colors {
|
||||
left: [1.0, 0.0, 0.0, 1.0],
|
||||
right: [0.0, 0.7734375, 0.9375, 1.0],
|
||||
};
|
||||
|
||||
let color_buffer = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
|
||||
let color_buf = device.create_buffer_init(&wgpu::util::BufferInitDescriptor {
|
||||
label: Some("colors"),
|
||||
contents: bytemuck::bytes_of(&colors),
|
||||
usage: wgpu::BufferUsages::UNIFORM | wgpu::BufferUsages::COPY_DST,
|
||||
|
|
@ -152,7 +136,7 @@ impl GameScreen {
|
|||
},
|
||||
wgpu::BindGroupEntry {
|
||||
binding: 2,
|
||||
resource: color_buffer.as_entire_binding(),
|
||||
resource: color_buf.as_entire_binding(),
|
||||
},
|
||||
],
|
||||
});
|
||||
|
|
@ -160,30 +144,19 @@ impl GameScreen {
|
|||
(
|
||||
Self {
|
||||
bind_group: Arc::new(bind_group),
|
||||
color_buffer: Arc::new(color_buffer),
|
||||
display_mode: DisplayMode::Anaglyph,
|
||||
colors,
|
||||
},
|
||||
sink,
|
||||
)
|
||||
}
|
||||
|
||||
pub fn update(&mut self, display_mode: DisplayMode, colors: [Color32; 2]) {
|
||||
self.display_mode = display_mode;
|
||||
self.colors = Colors::new(colors[0], colors[1]);
|
||||
}
|
||||
}
|
||||
|
||||
impl Widget for &mut GameScreen {
|
||||
impl Widget for &GameScreen {
|
||||
fn ui(self, ui: &mut egui::Ui) -> egui::Response {
|
||||
let response = ui.allocate_rect(ui.clip_rect(), egui::Sense::hover());
|
||||
let callback = egui_wgpu::Callback::new_paint_callback(
|
||||
response.rect,
|
||||
GameScreenCallback {
|
||||
bind_group: self.bind_group.clone(),
|
||||
color_buffer: self.color_buffer.clone(),
|
||||
display_mode: self.display_mode,
|
||||
colors: self.colors,
|
||||
},
|
||||
);
|
||||
ui.painter().add(callback);
|
||||
|
|
@ -193,23 +166,9 @@ impl Widget for &mut GameScreen {
|
|||
|
||||
struct GameScreenCallback {
|
||||
bind_group: Arc<BindGroup>,
|
||||
color_buffer: Arc<Buffer>,
|
||||
display_mode: DisplayMode,
|
||||
colors: Colors,
|
||||
}
|
||||
|
||||
impl egui_wgpu::CallbackTrait for GameScreenCallback {
|
||||
fn prepare(
|
||||
&self,
|
||||
_device: &wgpu::Device,
|
||||
queue: &wgpu::Queue,
|
||||
_screen_descriptor: &egui_wgpu::ScreenDescriptor,
|
||||
_egui_encoder: &mut wgpu::CommandEncoder,
|
||||
_callback_resources: &mut egui_wgpu::CallbackResources,
|
||||
) -> Vec<wgpu::CommandBuffer> {
|
||||
queue.write_buffer(&self.color_buffer, 0, bytemuck::bytes_of(&self.colors));
|
||||
vec![]
|
||||
}
|
||||
fn paint(
|
||||
&self,
|
||||
info: egui::PaintCallbackInfo,
|
||||
|
|
@ -222,58 +181,26 @@ impl egui_wgpu::CallbackTrait for GameScreenCallback {
|
|||
let top = viewport.top_px as f32;
|
||||
let width = viewport.width_px as f32;
|
||||
let height = viewport.height_px as f32;
|
||||
let aspect_ratio = {
|
||||
let proportions = self.display_mode.proportions();
|
||||
proportions.x / proportions.y
|
||||
};
|
||||
let aspect_ratio = 384.0 / 224.0;
|
||||
let w = width.min(height * aspect_ratio);
|
||||
let h = height.min(width / aspect_ratio);
|
||||
let x = left + (width - w) / 2.0;
|
||||
let y = top + (height - h) / 2.0;
|
||||
let pipeline = resources
|
||||
.render_pipelines
|
||||
.get(&self.display_mode)
|
||||
.unwrap_or_else(|| panic!("Unrecognized display mode {:?}", self.display_mode));
|
||||
render_pass.set_pipeline(pipeline);
|
||||
render_pass.set_bind_group(0, Some(self.bind_group.as_ref()), &[]);
|
||||
render_pass.set_pipeline(&resources.pipeline);
|
||||
render_pass.set_bind_group(0, &self.bind_group, &[]);
|
||||
render_pass.set_viewport(x, y, w, h, 0.0, 1.0);
|
||||
render_pass.draw(0..6, 0..1);
|
||||
}
|
||||
}
|
||||
|
||||
struct SharedGameScreenResources {
|
||||
render_pipelines: HashMap<DisplayMode, RenderPipeline>,
|
||||
pipeline: RenderPipeline,
|
||||
bind_group_layout: BindGroupLayout,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, bytemuck::Pod, bytemuck::Zeroable)]
|
||||
#[repr(C)]
|
||||
struct Colors {
|
||||
left: Rgba,
|
||||
right: Rgba,
|
||||
}
|
||||
impl Colors {
|
||||
fn new(left: Color32, right: Color32) -> Self {
|
||||
Self {
|
||||
left: left.into(),
|
||||
right: right.into(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug, Serialize, Deserialize)]
|
||||
pub enum DisplayMode {
|
||||
Anaglyph,
|
||||
LeftEye,
|
||||
RightEye,
|
||||
SideBySide,
|
||||
}
|
||||
|
||||
impl DisplayMode {
|
||||
pub fn proportions(self) -> Vec2 {
|
||||
match self {
|
||||
Self::SideBySide => Vec2::new(768.0, 224.0),
|
||||
_ => Vec2::new(384.0, 224.0),
|
||||
}
|
||||
}
|
||||
left: [f32; 4],
|
||||
right: [f32; 4],
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,111 +0,0 @@
|
|||
use egui::{Button, CentralPanel, TextEdit, ViewportBuilder, ViewportId};
|
||||
use winit::event_loop::EventLoopProxy;
|
||||
|
||||
use crate::{
|
||||
app::UserEvent,
|
||||
emulator::{EmulatorClient, SimId, SimState},
|
||||
gdbserver::{GdbServer, GdbServerStatus},
|
||||
};
|
||||
|
||||
use super::AppWindow;
|
||||
|
||||
pub struct GdbServerWindow {
|
||||
sim_id: SimId,
|
||||
client: EmulatorClient,
|
||||
port_str: String,
|
||||
connected: bool,
|
||||
quit_on_disconnect: bool,
|
||||
server: GdbServer,
|
||||
proxy: EventLoopProxy<UserEvent>,
|
||||
}
|
||||
|
||||
impl GdbServerWindow {
|
||||
pub fn new(sim_id: SimId, client: EmulatorClient, proxy: EventLoopProxy<UserEvent>) -> Self {
|
||||
Self {
|
||||
sim_id,
|
||||
client: client.clone(),
|
||||
port_str: (8080 + sim_id.to_index()).to_string(),
|
||||
connected: false,
|
||||
quit_on_disconnect: false,
|
||||
server: GdbServer::new(sim_id, client),
|
||||
proxy,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn launch(&mut self, port: u16) {
|
||||
self.server.stop();
|
||||
self.port_str = port.to_string();
|
||||
self.quit_on_disconnect = true;
|
||||
self.server.start(port);
|
||||
self.connected = true;
|
||||
}
|
||||
}
|
||||
|
||||
impl AppWindow for GdbServerWindow {
|
||||
fn viewport_id(&self) -> ViewportId {
|
||||
ViewportId::from_hash_of(format!("Debugger-{}", self.sim_id))
|
||||
}
|
||||
|
||||
fn sim_id(&self) -> SimId {
|
||||
self.sim_id
|
||||
}
|
||||
|
||||
fn initial_viewport(&self) -> ViewportBuilder {
|
||||
ViewportBuilder::default()
|
||||
.with_title(format!("GDB Server ({})", self.sim_id))
|
||||
.with_inner_size((300.0, 200.0))
|
||||
}
|
||||
|
||||
fn show(&mut self, ctx: &egui::Context) {
|
||||
let port_num: Option<u16> = self.port_str.parse().ok();
|
||||
let status = self.server.status();
|
||||
CentralPanel::default().show(ctx, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
if port_num.is_none() {
|
||||
let style = ui.style_mut();
|
||||
let error = style.visuals.error_fg_color;
|
||||
style.visuals.widgets.active.bg_stroke.color = error;
|
||||
style.visuals.widgets.hovered.bg_stroke.color = error;
|
||||
}
|
||||
ui.label("Port");
|
||||
let port_editor = TextEdit::singleline(&mut self.port_str).desired_width(100.0);
|
||||
ui.add_enabled(!status.running(), port_editor);
|
||||
ui.checkbox(&mut self.quit_on_disconnect, "Quit on disconnect");
|
||||
});
|
||||
|
||||
if !status.running() {
|
||||
if self.connected && self.quit_on_disconnect {
|
||||
self.proxy.send_event(UserEvent::Quit(self.sim_id)).unwrap();
|
||||
} else {
|
||||
self.connected = false;
|
||||
}
|
||||
let start_button = Button::new("Start");
|
||||
let can_start =
|
||||
port_num.is_some() && self.client.sim_state(self.sim_id) == SimState::Ready;
|
||||
if ui.add_enabled(can_start, start_button).clicked() {
|
||||
let port = port_num.unwrap();
|
||||
self.server.start(port);
|
||||
self.connected = true;
|
||||
}
|
||||
} else {
|
||||
let stop_button = Button::new("Stop");
|
||||
if ui.add(stop_button).clicked() {
|
||||
self.server.stop();
|
||||
}
|
||||
}
|
||||
|
||||
match &status {
|
||||
GdbServerStatus::Stopped => {}
|
||||
GdbServerStatus::Connecting => {
|
||||
ui.label("Connecting...");
|
||||
}
|
||||
GdbServerStatus::Running => {
|
||||
ui.label("Running");
|
||||
}
|
||||
GdbServerStatus::Error(message) => {
|
||||
ui.label(message);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -53,12 +53,10 @@ impl InputWindow {
|
|||
ui.horizontal(|ui| {
|
||||
if ui.button("Use defaults").clicked() {
|
||||
mappings.write().unwrap().use_default_mappings();
|
||||
self.mappings.save();
|
||||
self.now_binding = None;
|
||||
}
|
||||
if ui.button("Clear all").clicked() {
|
||||
mappings.write().unwrap().clear_all_mappings();
|
||||
self.mappings.save();
|
||||
self.now_binding = None;
|
||||
}
|
||||
});
|
||||
|
|
@ -101,8 +99,6 @@ impl InputWindow {
|
|||
{
|
||||
let mut mapping = mappings.write().unwrap();
|
||||
mapping.clear_mappings(*key);
|
||||
drop(mapping);
|
||||
self.mappings.save();
|
||||
self.now_binding = None;
|
||||
}
|
||||
});
|
||||
|
|
@ -214,8 +210,6 @@ impl AppWindow for InputWindow {
|
|||
};
|
||||
let mut mappings = self.mappings.for_sim(sim_id).write().unwrap();
|
||||
mappings.add_keyboard_mapping(vb, event.physical_key);
|
||||
drop(mappings);
|
||||
self.mappings.save();
|
||||
}
|
||||
|
||||
fn handle_gamepad_event(&mut self, event: &gilrs::Event) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue