Skip to content

armgit / gecko

Public Imported from GitHub
0

A GameCube/Wii emulator and debugger written in Rust.

basis for hollywood

Layleeaa02aedf904
diff --git a/crates/dbglib/src/windows/callstack.rs b/crates/dbglib/src/windows/callstack.rs
index ee7e86a..96154d6 100644
--- a/crates/dbglib/src/windows/callstack.rs
+++ b/crates/dbglib/src/windows/callstack.rs
@@ -1,4 +1,5 @@
use egui::{Color32, Context, RichText, ScrollArea};
+use gecko::SystemId;
use gecko::gekko::Gekko;
use gecko::mmio::Mmio;
use image::symbols::SymbolTable;
@@ -25,7 +26,11 @@ pub struct CallFrame {
///
/// We emit the current PC, then LR (handles leaf functions that never save
/// LR to the stack), then walk back-chain pointers reading saved LRs.
-pub fn walk_callstack(cpu: &Gekko, mmio: &Mmio, symbols: Option<&SymbolTable>) -> Vec<CallFrame> {
+pub fn walk_callstack<const SYSTEM: SystemId>(
+ cpu: &Gekko,
+ mmio: &Mmio<SYSTEM>,
+ symbols: Option<&SymbolTable>,
+) -> Vec<CallFrame> {
let mut frames = Vec::new();
let resolve = |addr: u32| -> (Option<String>, u32) {
@@ -93,7 +98,13 @@ pub fn walk_callstack(cpu: &Gekko, mmio: &Mmio, symbols: Option<&SymbolTable>) -
frames
}
-pub fn show_callstack(ctx: &Context, open: &mut bool, cpu: &Gekko, mmio: &Mmio, symbols: Option<&SymbolTable>) {
+pub fn show_callstack<const SYSTEM: SystemId>(
+ ctx: &Context,
+ open: &mut bool,
+ cpu: &Gekko,
+ mmio: &Mmio<SYSTEM>,
+ symbols: Option<&SymbolTable>,
+) {
let frames = walk_callstack(cpu, mmio, symbols);
egui::Window::new("Call Stack").open(open).show(ctx, |ui| {
diff --git a/crates/dbglib/src/windows/cpu.rs b/crates/dbglib/src/windows/cpu.rs
index 09f746b..a0085af 100644
--- a/crates/dbglib/src/windows/cpu.rs
+++ b/crates/dbglib/src/windows/cpu.rs
@@ -1,4 +1,5 @@
use egui::{Color32, Context, Grid, RichText, ScrollArea};
+use gecko::SystemId;
use gecko::gekko::Gekko;
use gecko::mmio::Mmio;
use image::symbols::SymbolTable;
@@ -6,11 +7,11 @@ use image::symbols::SymbolTable;
use super::token_color;
use crate::Breakpoint;
-pub fn show_cpu(
+pub fn show_cpu<const SYSTEM: SystemId>(
ctx: &Context,
open: &mut bool,
cpu: &Gekko,
- mmio: &Mmio,
+ mmio: &Mmio<SYSTEM>,
symbols: Option<&SymbolTable>,
breakpoints: &[Breakpoint],
) {
diff --git a/crates/dbglib/src/windows/gx.rs b/crates/dbglib/src/windows/gx.rs
index 656f2de..aabf510 100644
--- a/crates/dbglib/src/windows/gx.rs
+++ b/crates/dbglib/src/windows/gx.rs
@@ -1,4 +1,5 @@
use egui::{Context, Grid, ScrollArea};
+use gecko::SystemId;
use gecko::flipper::gx::GraphicsProcessor;
use gecko::flipper::gx::draw::{TextureDescriptor, TlutRef};
use gecko::mmio::Mmio;
@@ -21,11 +22,11 @@ fn texture_preview(ui: &mut egui::Ui, tex: &TextureDescriptor, ram: &[u8], palet
ui.label(format!("Mag: {:?} Min: {:?}", tex.mag_filter, tex.min_filter));
}
-pub fn show_gx(
+pub fn show_gx<const SYSTEM: SystemId>(
ctx: &Context,
open: &mut bool,
gx: &GraphicsProcessor,
- mmio: &Mmio,
+ mmio: &Mmio<SYSTEM>,
invalidate_caches: &mut bool,
dump_textures: &mut bool,
) {
diff --git a/crates/dbglib/src/windows/mmio.rs b/crates/dbglib/src/windows/mmio.rs
index 6f64865..71a0382 100644
--- a/crates/dbglib/src/windows/mmio.rs
+++ b/crates/dbglib/src/windows/mmio.rs
@@ -1,7 +1,14 @@
use egui::{Context, Grid, ScrollArea};
+use gecko::SystemId;
use gecko::mmio::Mmio;
-pub fn show_mmio(ctx: &Context, open: &mut bool, base: &mut u32, addr_input: &mut String, mmio: &Mmio) {
+pub fn show_mmio<const SYSTEM: SystemId>(
+ ctx: &Context,
+ open: &mut bool,
+ base: &mut u32,
+ addr_input: &mut String,
+ mmio: &Mmio<SYSTEM>,
+) {
egui::Window::new("Memory").open(open).show(ctx, |ui| {
ui.horizontal(|ui| {
ui.label("Address:");
diff --git a/crates/gecko/src/flipper/dsp.rs b/crates/gecko/src/flipper/dsp.rs
index ebdddb2..9b4b16b 100644
--- a/crates/gecko/src/flipper/dsp.rs
+++ b/crates/gecko/src/flipper/dsp.rs
@@ -92,7 +92,7 @@ impl Dsp {
}
}
- pub fn process_aram_dma(&mut self, mmio: &mut Mmio) {
+ pub fn process_aram_dma<const SYSTEM: SystemId>(&mut self, mmio: &mut Mmio<SYSTEM>) {
let ram_addr = (self.aram_dma_mmio_addr.raw() & 0x3FFFFFFF) as usize;
let aram_addr = self.aram_dma_aram_addr.raw() as usize;
let count = self.aram_dma_control.count() as usize;
@@ -124,7 +124,7 @@ impl Dsp {
self.csr = self.csr.with_ar_interrupt(true);
}
- pub fn process_ucode_upload(&mut self, mmio: &mut Mmio) {
+ pub fn process_ucode_upload<const SYSTEM: SystemId>(&mut self, mmio: &mut Mmio<SYSTEM>) {
const UCODE_ADDR: usize = 0x8100_0000;
const UCODE_SIZE: usize = 1024;
let src = mmio.virt_slice(UCODE_ADDR as u32, UCODE_SIZE);
@@ -140,7 +140,7 @@ impl Dsp {
self.csr.set_dsp_interrupt(true);
}
- pub fn process_dsp_dma(&mut self, mmio: &mut Mmio) {
+ pub fn process_dsp_dma<const SYSTEM: SystemId>(&mut self, mmio: &mut Mmio<SYSTEM>) {
let ram_addr = ((self.dma_ram_addr_hi as u32) << 16) | self.dma_ram_addr_lo as u32;
let dsp_addr = (self.dma_dsp_addr as usize) * 2; // word address -> byte offset
let len = self.dma_length as usize;
diff --git a/crates/gecko/src/flipper/gx.rs b/crates/gecko/src/flipper/gx.rs
index 8c41ada..729f5d5 100644
--- a/crates/gecko/src/flipper/gx.rs
+++ b/crates/gecko/src/flipper/gx.rs
@@ -135,22 +135,37 @@ impl GraphicsProcessor {
}
}
- pub fn mmio_write_u8(&mut self, mmio: &mut Mmio, renderer: &mut dyn RenderSink, val: u8) {
+ pub fn mmio_write_u8<const SYSTEM: SystemId>(
+ &mut self,
+ mmio: &mut Mmio<SYSTEM>,
+ renderer: &mut dyn RenderSink,
+ val: u8,
+ ) {
self.push_u8(val);
self.drain_fifo(mmio, renderer);
}
- pub fn mmio_write_u16(&mut self, mmio: &mut Mmio, renderer: &mut dyn RenderSink, val: u16) {
+ pub fn mmio_write_u16<const SYSTEM: SystemId>(
+ &mut self,
+ mmio: &mut Mmio<SYSTEM>,
+ renderer: &mut dyn RenderSink,
+ val: u16,
+ ) {
self.push_u16(val);
self.drain_fifo(mmio, renderer);
}
- pub fn mmio_write_u32(&mut self, mmio: &mut Mmio, renderer: &mut dyn RenderSink, val: u32) {
+ pub fn mmio_write_u32<const SYSTEM: SystemId>(
+ &mut self,
+ mmio: &mut Mmio<SYSTEM>,
+ renderer: &mut dyn RenderSink,
+ val: u32,
+ ) {
self.push_u32(val);
self.drain_fifo(mmio, renderer);
}
- fn drain_fifo(&mut self, mmio: &mut Mmio, renderer: &mut dyn RenderSink) {
+ fn drain_fifo<const SYSTEM: SystemId>(&mut self, mmio: &mut Mmio<SYSTEM>, renderer: &mut dyn RenderSink) {
for cmd in self.drain() {
match cmd {
FifoCmd::Cp(data) => self.load_cp(&data),
@@ -174,7 +189,12 @@ impl GraphicsProcessor {
}
}
- fn execute_display_list(&mut self, mmio: &mut Mmio, renderer: &mut dyn RenderSink, data: &[u8]) {
+ fn execute_display_list<const SYSTEM: SystemId>(
+ &mut self,
+ mmio: &mut Mmio<SYSTEM>,
+ renderer: &mut dyn RenderSink,
+ data: &[u8],
+ ) {
let saved = std::mem::take(&mut self.fifo);
self.fifo = data.to_vec();
self.drain_fifo(mmio, renderer);
diff --git a/crates/gecko/src/flipper/gx/vertex.rs b/crates/gecko/src/flipper/gx/vertex.rs
index d0dad7a..4a7660c 100644
--- a/crates/gecko/src/flipper/gx/vertex.rs
+++ b/crates/gecko/src/flipper/gx/vertex.rs
@@ -4,6 +4,7 @@ use super::regs::{self, *};
use super::{GraphicsProcessor, draw};
use crate::host::{DrawData, DrawVertex, GxAction, LightData, RenderSink};
use crate::mmio::Mmio;
+use crate::system::SystemId;
use std::io::{Cursor, Read};
/// Parsed vertex format descriptor from CP/VAT registers.
@@ -40,7 +41,13 @@ struct VertexFormat {
}
impl GraphicsProcessor {
- pub fn create_draw_call(&mut self, mmio: &mut Mmio, renderer: &mut dyn RenderSink, cmd: u8, data: Vec<u8>) {
+ pub fn create_draw_call<const SYSTEM: SystemId>(
+ &mut self,
+ mmio: &mut Mmio<SYSTEM>,
+ renderer: &mut dyn RenderSink,
+ cmd: u8,
+ data: Vec<u8>,
+ ) {
let Some(primitive) = draw::Primitive::from_cmd(cmd) else {
tracing::error!(cmd, "goofy draw command");
return;
diff --git a/crates/gecko/src/gekko/irq.rs b/crates/gecko/src/gekko/irq.rs
index 451d323..e3e589a 100644
--- a/crates/gecko/src/gekko/irq.rs
+++ b/crates/gecko/src/gekko/irq.rs
@@ -1,22 +1,21 @@
use crate::gekko::spr::Srr0;
-use crate::mmio::Mmio;
use crate::system::{System, SystemId};
// Exception vectors
-#[rustfmt::skip] pub const IRQ_SYSTEM_RESET: u32 = Mmio::virt_to_phys(0x8000_0100);
-#[rustfmt::skip] pub const IRQ_MACHINE_CHECK: u32 = Mmio::virt_to_phys(0x8000_0200);
-#[rustfmt::skip] pub const IRQ_DSI: u32 = Mmio::virt_to_phys(0x8000_0300);
-#[rustfmt::skip] pub const IRQ_ISI: u32 = Mmio::virt_to_phys(0x8000_0400);
-#[rustfmt::skip] pub const IRQ_EXTERNAL: u32 = Mmio::virt_to_phys(0x8000_0500); // traditional IRQ
-#[rustfmt::skip] pub const IRQ_ALIGNMENT: u32 = Mmio::virt_to_phys(0x8000_0600);
-#[rustfmt::skip] pub const IRQ_PROGRAM: u32 = Mmio::virt_to_phys(0x8000_0700);
-#[rustfmt::skip] pub const IRQ_FP_UNAVAILABLE: u32 = Mmio::virt_to_phys(0x8000_0800);
-#[rustfmt::skip] pub const IRQ_DECREMENTER: u32 = Mmio::virt_to_phys(0x8000_0900);
-#[rustfmt::skip] pub const IRQ_SYSTEM_CALL: u32 = Mmio::virt_to_phys(0x8000_0C00);
-#[rustfmt::skip] pub const IRQ_TRACE: u32 = Mmio::virt_to_phys(0x8000_0D00);
-#[rustfmt::skip] pub const IRQ_PERFORMANCE_MONITOR: u32 = Mmio::virt_to_phys(0x8000_0F00);
-#[rustfmt::skip] pub const IRQ_IABR: u32 = Mmio::virt_to_phys(0x8000_1300);
-#[rustfmt::skip] pub const IRQ_THERMAL: u32 = Mmio::virt_to_phys(0x8000_1400);
+#[rustfmt::skip] pub const IRQ_SYSTEM_RESET: u32 = crate::mmio::virt_to_phys(0x8000_0100);
+#[rustfmt::skip] pub const IRQ_MACHINE_CHECK: u32 = crate::mmio::virt_to_phys(0x8000_0200);
+#[rustfmt::skip] pub const IRQ_DSI: u32 = crate::mmio::virt_to_phys(0x8000_0300);
+#[rustfmt::skip] pub const IRQ_ISI: u32 = crate::mmio::virt_to_phys(0x8000_0400);
+#[rustfmt::skip] pub const IRQ_EXTERNAL: u32 = crate::mmio::virt_to_phys(0x8000_0500); // traditional IRQ
+#[rustfmt::skip] pub const IRQ_ALIGNMENT: u32 = crate::mmio::virt_to_phys(0x8000_0600);
+#[rustfmt::skip] pub const IRQ_PROGRAM: u32 = crate::mmio::virt_to_phys(0x8000_0700);
+#[rustfmt::skip] pub const IRQ_FP_UNAVAILABLE: u32 = crate::mmio::virt_to_phys(0x8000_0800);
+#[rustfmt::skip] pub const IRQ_DECREMENTER: u32 = crate::mmio::virt_to_phys(0x8000_0900);
+#[rustfmt::skip] pub const IRQ_SYSTEM_CALL: u32 = crate::mmio::virt_to_phys(0x8000_0C00);
+#[rustfmt::skip] pub const IRQ_TRACE: u32 = crate::mmio::virt_to_phys(0x8000_0D00);
+#[rustfmt::skip] pub const IRQ_PERFORMANCE_MONITOR: u32 = crate::mmio::virt_to_phys(0x8000_0F00);
+#[rustfmt::skip] pub const IRQ_IABR: u32 = crate::mmio::virt_to_phys(0x8000_1300);
+#[rustfmt::skip] pub const IRQ_THERMAL: u32 = crate::mmio::virt_to_phys(0x8000_1400);
impl<const SYSTEM: SystemId> System<SYSTEM> {
pub fn cause_external_interrupt(&mut self) {
diff --git a/crates/gecko/src/hollywood.rs b/crates/gecko/src/hollywood.rs
new file mode 100644
index 0000000..7461bce
--- /dev/null
+++ b/crates/gecko/src/hollywood.rs
@@ -0,0 +1,2 @@
+pub mod ipc;
+pub mod irq;
diff --git a/crates/gecko/src/hollywood/ipc.rs b/crates/gecko/src/hollywood/ipc.rs
new file mode 100644
index 0000000..714bd4d
--- /dev/null
+++ b/crates/gecko/src/hollywood/ipc.rs
@@ -0,0 +1,11 @@
+use crate::system::{System, SystemId};
+
+#[inline(always)]
+pub fn ipc_read<const SYSTEM: SystemId>(_sys: &mut System<SYSTEM>, _addr: u32, _size: u32) -> Option<u32> {
+ Some(0)
+}
+
+#[inline(always)]
+pub fn ipc_write<const SYSTEM: SystemId>(_sys: &mut System<SYSTEM>, _addr: u32, _size: u32, _val: u32) -> bool {
+ true
+}
diff --git a/crates/gecko/src/hollywood/irq.rs b/crates/gecko/src/hollywood/irq.rs
new file mode 100644
index 0000000..3022cf9
--- /dev/null
+++ b/crates/gecko/src/hollywood/irq.rs
@@ -0,0 +1,11 @@
+use crate::system::{System, SystemId};
+
+#[inline(always)]
+pub fn irq_read<const SYSTEM: SystemId>(_sys: &mut System<SYSTEM>, _addr: u32, _size: u32) -> Option<u32> {
+ Some(0)
+}
+
+#[inline(always)]
+pub fn irq_write<const SYSTEM: SystemId>(_sys: &mut System<SYSTEM>, _addr: u32, _size: u32, _val: u32) -> bool {
+ true
+}
diff --git a/crates/gecko/src/lib.rs b/crates/gecko/src/lib.rs
index 1b7bbb1..60baa33 100644
--- a/crates/gecko/src/lib.rs
+++ b/crates/gecko/src/lib.rs
@@ -3,6 +3,7 @@ pub mod dvd;
pub mod flipper;
pub mod gamecube;
pub mod gekko;
+pub mod hollywood;
pub mod host;
pub mod idle;
pub mod ipl;
diff --git a/crates/gecko/src/mmio.rs b/crates/gecko/src/mmio.rs
index 05666a8..46e9e31 100644
--- a/crates/gecko/src/mmio.rs
+++ b/crates/gecko/src/mmio.rs
@@ -4,17 +4,19 @@ pub mod fp;
pub mod macros;
pub mod traits;
+use crate::system::{SystemId, WII};
use constants::*;
-pub struct Mmio {
+pub struct Mmio<const SYSTEM: SystemId> {
pub ram: Vec<u8>,
pub efb: Vec<u8>,
pub hwr: Vec<u8>,
pub ipl: Vec<u8>,
pub lcache: Vec<u8>,
+ pub mem2: Vec<u8>,
}
-impl Mmio {
+impl<const SYSTEM: SystemId> Mmio<SYSTEM> {
pub fn new() -> Self {
Mmio {
ram: vec![0; RAM_SIZE],
@@ -22,6 +24,7 @@ impl Mmio {
hwr: vec![0; HW_REG_SIZE],
ipl: vec![0; 0],
lcache: vec![0; LCACHE_SIZE],
+ mem2: if SYSTEM == WII { vec![0; MEM2_SIZE] } else { Vec::new() },
}
}
@@ -35,6 +38,7 @@ impl Mmio {
HW_REG_BASE..=HW_REG_END => (&self.hwr, (phys - HW_REG_BASE) as usize),
IPL_BASE..=IPL_END => (&self.ipl, (phys - IPL_BASE) as usize),
LCACHE_BASE..=LCACHE_END => (&self.lcache, (phys - LCACHE_BASE) as usize),
+ MEM2_BASE..=MEM2_END if SYSTEM == WII => (&self.mem2, (phys - MEM2_BASE) as usize),
_ => {
tracing::error!(phys_addr = format!("{:08X}", phys), "unmapped physical read");
(&self.ram, 0)
@@ -53,6 +57,7 @@ impl Mmio {
HW_REG_BASE..=HW_REG_END => (&mut self.hwr, (phys - HW_REG_BASE) as usize),
IPL_BASE..=IPL_END => (&mut self.ipl, (phys - IPL_BASE) as usize),
LCACHE_BASE..=LCACHE_END => (&mut self.lcache, (phys - LCACHE_BASE) as usize),
+ MEM2_BASE..=MEM2_END if SYSTEM == WII => (&mut self.mem2, (phys - MEM2_BASE) as usize),
_ => {
tracing::error!(phys_addr = format!("{:08X}", phys), "unmapped physical write");
(&mut self.ram, 0)
@@ -74,7 +79,7 @@ impl Mmio {
#[inline(always)]
pub fn phys_read_u16(&self, addr: u32) -> u16 {
let (slice, offset) = self.resolve(addr);
- let value = unsafe { Self::read_be_u16_unchecked(slice.as_ptr().add(offset)) };
+ let value = unsafe { read_be_u16_unchecked(slice.as_ptr().add(offset)) };
tracing::trace!(
phys_addr = format!("{:08X}", addr),
value = format!("{:04X}", value),
@@ -86,7 +91,7 @@ impl Mmio {
#[inline(always)]
pub fn phys_read_u32(&self, addr: u32) -> u32 {
let (slice, offset) = self.resolve(addr);
- let value = unsafe { Self::read_be_u32_unchecked(slice.as_ptr().add(offset)) };
+ let value = unsafe { read_be_u32_unchecked(slice.as_ptr().add(offset)) };
tracing::trace!(
phys_addr = format!("{:08X}", addr),
value = format!("{:08X}", value),
@@ -114,7 +119,7 @@ impl Mmio {
value = format!("{:04X}", value),
"write_u16"
);
- unsafe { Self::write_be_u16_unchecked(slice.as_mut_ptr().add(offset), value) };
+ unsafe { write_be_u16_unchecked(slice.as_mut_ptr().add(offset), value) };
}
#[inline(always)]
@@ -125,37 +130,37 @@ impl Mmio {
value = format!("{:08X}", value),
"write_u32"
);
- unsafe { Self::write_be_u32_unchecked(slice.as_mut_ptr().add(offset), value) };
+ unsafe { write_be_u32_unchecked(slice.as_mut_ptr().add(offset), value) };
}
#[inline(always)]
pub fn virt_read_u8(&self, addr: u32) -> u8 {
- self.phys_read_u8(Self::virt_to_phys(addr))
+ self.phys_read_u8(virt_to_phys(addr))
}
#[inline(always)]
pub fn virt_read_u16(&self, addr: u32) -> u16 {
- self.phys_read_u16(Self::virt_to_phys(addr))
+ self.phys_read_u16(virt_to_phys(addr))
}
#[inline(always)]
pub fn virt_read_u32(&self, addr: u32) -> u32 {
- self.phys_read_u32(Self::virt_to_phys(addr))
+ self.phys_read_u32(virt_to_phys(addr))
}
#[inline(always)]
pub fn virt_write_u8(&mut self, addr: u32, value: u8) {
- self.phys_write_u8(Self::virt_to_phys(addr), value);
+ self.phys_write_u8(virt_to_phys(addr), value);
}
#[inline(always)]
pub fn virt_write_u16(&mut self, addr: u32, value: u16) {
- self.phys_write_u16(Self::virt_to_phys(addr), value);
+ self.phys_write_u16(virt_to_phys(addr), value);
}
#[inline(always)]
pub fn virt_write_u32(&mut self, addr: u32, value: u32) {
- self.phys_write_u32(Self::virt_to_phys(addr), value);
+ self.phys_write_u32(virt_to_phys(addr), value);
}
/// Return a slice of physical memory starting at `addr` with length `len`
@@ -176,12 +181,12 @@ impl Mmio {
/// This is just a thin wrapper around `phys_slice` that applies virtual-to-physical translation
#[inline(always)]
pub fn virt_slice(&self, addr: u32, len: usize) -> &[u8] {
- self.phys_slice(Self::virt_to_phys(addr), len)
+ self.phys_slice(virt_to_phys(addr), len)
}
#[inline(always)]
pub fn virt_slice_mut(&mut self, addr: u32, len: usize) -> &mut [u8] {
- self.phys_slice_mut(Self::virt_to_phys(addr), len)
+ self.phys_slice_mut(virt_to_phys(addr), len)
}
/// Read a typed MMIO register from its physical address
@@ -208,12 +213,6 @@ impl Mmio {
}
}
- // Simple virtual to physical translation that ignores caching and other MMIO features
- #[inline(always)]
- pub const fn virt_to_phys(addr: u32) -> u32 {
- addr & 0x3FFFFFFF
- }
-
/// Process a locked cache DMA transfer triggered by writing to SPR DMAL (923).
pub fn process_locked_cache_dma(&mut self, dmau: &crate::gekko::spr::DmaUpper, dmal: &crate::gekko::spr::DmaLower) {
let ram_addr = dmau.ram_addr() << 5;
@@ -242,7 +241,7 @@ impl Mmio {
#[inline(always)]
pub fn fetch_instruction(&self, addr: u32) -> u32 {
- let phys = Self::virt_to_phys(addr);
+ let phys = virt_to_phys(addr);
if phys <= RAM_END - 3 {
self.ram_read_u32(phys)
} else {
@@ -264,7 +263,7 @@ impl Mmio {
#[inline(always)]
pub fn ram_read_u16(&self, phys: u32) -> u16 {
debug_assert!(phys <= RAM_END - 1);
- let value = unsafe { Self::read_be_u16_unchecked(self.ram.as_ptr().add(phys as usize)) };
+ let value = unsafe { read_be_u16_unchecked(self.ram.as_ptr().add(phys as usize)) };
tracing::trace!(
phys_addr = format!("{:08X}", phys),
value = format!("{:04X}", value),
@@ -276,7 +275,7 @@ impl Mmio {
#[inline(always)]
pub fn ram_read_u32(&self, phys: u32) -> u32 {
debug_assert!(phys <= RAM_END - 3);
- let value = unsafe { Self::read_be_u32_unchecked(self.ram.as_ptr().add(phys as usize)) };
+ let value = unsafe { read_be_u32_unchecked(self.ram.as_ptr().add(phys as usize)) };
tracing::trace!(
phys_addr = format!("{:08X}", phys),
value = format!("{:08X}", value),
@@ -288,7 +287,7 @@ impl Mmio {
#[inline(always)]
pub fn ram_read_u64(&self, phys: u32) -> u64 {
debug_assert!(phys <= RAM_END - 7);
- unsafe { Self::read_be_u64_unchecked(self.ram.as_ptr().add(phys as usize)) }
+ unsafe { read_be_u64_unchecked(self.ram.as_ptr().add(phys as usize)) }
}
#[inline(always)]
@@ -309,7 +308,7 @@ impl Mmio {
value = format!("{:04X}", value),
"write_u16"
);
- unsafe { Self::write_be_u16_unchecked(self.ram.as_mut_ptr().add(phys as usize), value) };
+ unsafe { write_be_u16_unchecked(self.ram.as_mut_ptr().add(phys as usize), value) };
}
#[inline(always)]
@@ -320,42 +319,47 @@ impl Mmio {
value = format!("{:08X}", value),
"write_u32"
);
- unsafe { Self::write_be_u32_unchecked(self.ram.as_mut_ptr().add(phys as usize), value) };
+ unsafe { write_be_u32_unchecked(self.ram.as_mut_ptr().add(phys as usize), value) };
}
#[inline(always)]
pub fn ram_write_u64(&mut self, phys: u32, value: u64) {
debug_assert!(phys <= RAM_END - 7);
- unsafe { Self::write_be_u64_unchecked(self.ram.as_mut_ptr().add(phys as usize), value) };
+ unsafe { write_be_u64_unchecked(self.ram.as_mut_ptr().add(phys as usize), value) };
}
+}
- #[inline(always)]
- unsafe fn read_be_u16_unchecked(ptr: *const u8) -> u16 {
- u16::from_be(unsafe { std::ptr::read_unaligned(ptr.cast::<u16>()) })
- }
+#[inline(always)]
+pub const fn virt_to_phys(addr: u32) -> u32 {
+ addr & 0x3FFFFFFF
+}
- #[inline(always)]
- unsafe fn read_be_u32_unchecked(ptr: *const u8) -> u32 {
- u32::from_be(unsafe { std::ptr::read_unaligned(ptr.cast::<u32>()) })
- }
+#[inline(always)]
+unsafe fn read_be_u16_unchecked(ptr: *const u8) -> u16 {
+ u16::from_be(unsafe { std::ptr::read_unaligned(ptr.cast::<u16>()) })
+}
- #[inline(always)]
- unsafe fn read_be_u64_unchecked(ptr: *const u8) -> u64 {
- u64::from_be(unsafe { std::ptr::read_unaligned(ptr.cast::<u64>()) })
- }
+#[inline(always)]
+unsafe fn read_be_u32_unchecked(ptr: *const u8) -> u32 {
+ u32::from_be(unsafe { std::ptr::read_unaligned(ptr.cast::<u32>()) })
+}
- #[inline(always)]
- unsafe fn write_be_u16_unchecked(ptr: *mut u8, value: u16) {
- unsafe { std::ptr::write_unaligned(ptr.cast::<u16>(), value.to_be()) };
- }
+#[inline(always)]
+unsafe fn read_be_u64_unchecked(ptr: *const u8) -> u64 {
+ u64::from_be(unsafe { std::ptr::read_unaligned(ptr.cast::<u64>()) })
+}
- #[inline(always)]
- unsafe fn write_be_u32_unchecked(ptr: *mut u8, value: u32) {
- unsafe { std::ptr::write_unaligned(ptr.cast::<u32>(), value.to_be()) };
- }
+#[inline(always)]
+unsafe fn write_be_u16_unchecked(ptr: *mut u8, value: u16) {
+ unsafe { std::ptr::write_unaligned(ptr.cast::<u16>(), value.to_be()) };
+}
- #[inline(always)]
- unsafe fn write_be_u64_unchecked(ptr: *mut u8, value: u64) {
- unsafe { std::ptr::write_unaligned(ptr.cast::<u64>(), value.to_be()) };
- }
+#[inline(always)]
+unsafe fn write_be_u32_unchecked(ptr: *mut u8, value: u32) {
+ unsafe { std::ptr::write_unaligned(ptr.cast::<u32>(), value.to_be()) };
+}
+
+#[inline(always)]
+unsafe fn write_be_u64_unchecked(ptr: *mut u8, value: u64) {
+ unsafe { std::ptr::write_unaligned(ptr.cast::<u64>(), value.to_be()) };
}
diff --git a/crates/gecko/src/mmio/bus.rs b/crates/gecko/src/mmio/bus.rs
index 5b721d5..275359f 100644
--- a/crates/gecko/src/mmio/bus.rs
+++ b/crates/gecko/src/mmio/bus.rs
@@ -2,10 +2,10 @@
use crate::hooks::HookFlags;
use crate::mmio::constants::{
AI_BASE, AI_END, CP_BASE, CP_END, DI_BASE, DI_END, DSP_BASE, DSP_END, EXI_BASE, EXI_END, GX_FIFO_BASE, GX_FIFO_END,
- HW_REG_BASE, HW_REG_END, MI_BASE, MI_END, PE_BASE, PE_END, PI_BASE, PI_END, RAM_END, SI_BASE, SI_END, VI_BASE,
- VI_END,
+ HOLLYWOOD_IRQ_BASE, HOLLYWOOD_IRQ_END, HW_HOLLYWOOD_BASE, HW_HOLLYWOOD_END, HW_REG_BASE, HW_REG_END, IPC_BASE,
+ IPC_END, MI_BASE, MI_END, PE_BASE, PE_END, PI_BASE, PI_END, RAM_END, SI_BASE, SI_END, VI_BASE, VI_END,
};
-use crate::system::{System, SystemId};
+use crate::system::{System, SystemId, WII};
macro_rules! bus_read_hooks {
($self:ident, $addr:ident, $phys:ident, $size:literal, $body:expr) => {{
@@ -300,22 +300,35 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
);
0
}) as u8,
+ IPC_BASE..=IPC_END if SYSTEM == WII => crate::hollywood::ipc::ipc_read(self, phys, 1).unwrap_or(0) as u8,
+ HOLLYWOOD_IRQ_BASE..=HOLLYWOOD_IRQ_END if SYSTEM == WII => {
+ crate::hollywood::irq::irq_read(self, phys, 1).unwrap_or(0) as u8
+ }
+ HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
+ tracing::warn!(
+ device = "HOLLYWOOD",
+ addr = format!("{addr:08X}"),
+ phys_addr = format!("{phys:08X}"),
+ size = 1,
+ "Unimplemented MMIO read"
+ );
+ self.mmio.phys_read_u8(phys)
+ }
GX_FIFO_BASE..=GX_FIFO_END => {
tracing::error!(addr = format!("{:08X}", addr), "Invalid GX FIFO read");
0
}
- _ => {
- if (HW_REG_BASE..=HW_REG_END).contains(&phys) {
- tracing::warn!(
- device = "HW_REG",
- addr = format!("{addr:08X}"),
- phys_addr = format!("{phys:08X}"),
- size = 1,
- "Unimplemented MMIO read"
- );
- }
+ HW_REG_BASE..=HW_REG_END => {
+ tracing::warn!(
+ device = "HW_REG",
+ addr = format!("{addr:08X}"),
+ phys_addr = format!("{phys:08X}"),
+ size = 1,
+ "Unimplemented MMIO read"
+ );
self.mmio.phys_read_u8(phys)
}
+ _ => self.mmio.phys_read_u8(phys),
}
}
@@ -422,22 +435,35 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
);
0
}) as u16,
+ IPC_BASE..=IPC_END if SYSTEM == WII => crate::hollywood::ipc::ipc_read(self, phys, 2).unwrap_or(0) as u16,
+ HOLLYWOOD_IRQ_BASE..=HOLLYWOOD_IRQ_END if SYSTEM == WII => {
+ crate::hollywood::irq::irq_read(self, phys, 2).unwrap_or(0) as u16
+ }
+ HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
+ tracing::warn!(
+ device = "HOLLYWOOD",
+ addr = format!("{addr:08X}"),
+ phys_addr = format!("{phys:08X}"),
+ size = 2,
+ "Unimplemented MMIO read"
+ );
+ self.mmio.phys_read_u16(phys)
+ }
GX_FIFO_BASE..=GX_FIFO_END => {
tracing::error!(addr = format!("{:08X}", addr), "Invalid GX FIFO read");
0
}
- _ => {
- if (HW_REG_BASE..=HW_REG_END).contains(&phys) {
- tracing::warn!(
- device = "HW_REG",
- addr = format!("{addr:08X}"),
- phys_addr = format!("{phys:08X}"),
- size = 2,
- "Unimplemented MMIO read"
- );
- }
+ HW_REG_BASE..=HW_REG_END => {
+ tracing::warn!(
+ device = "HW_REG",
+ addr = format!("{addr:08X}"),
+ phys_addr = format!("{phys:08X}"),
+ size = 2,
+ "Unimplemented MMIO read"
+ );
self.mmio.phys_read_u16(phys)
}
+ _ => self.mmio.phys_read_u16(phys),
}
}
@@ -544,22 +570,35 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
);
0
}),
+ IPC_BASE..=IPC_END if SYSTEM == WII => crate::hollywood::ipc::ipc_read(self, phys, 4).unwrap_or(0),
+ HOLLYWOOD_IRQ_BASE..=HOLLYWOOD_IRQ_END if SYSTEM == WII => {
+ crate::hollywood::irq::irq_read(self, phys, 4).unwrap_or(0)
+ }
+ HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
+ tracing::warn!(
+ device = "HOLLYWOOD",
+ addr = format!("{addr:08X}"),
+ phys_addr = format!("{phys:08X}"),
+ size = 4,
+ "Unimplemented MMIO read"
+ );
+ self.mmio.phys_read_u32(phys)
+ }
GX_FIFO_BASE..=GX_FIFO_END => {
tracing::error!(addr = format!("{:08X}", addr), "Invalid GX FIFO read");
0
}
- _ => {
- if (HW_REG_BASE..=HW_REG_END).contains(&phys) {
- tracing::warn!(
- device = "HW_REG",
- addr = format!("{addr:08X}"),
- phys_addr = format!("{phys:08X}"),
- size = 4,
- "Unimplemented MMIO read"
- );
- }
+ HW_REG_BASE..=HW_REG_END => {
+ tracing::warn!(
+ device = "HW_REG",
+ addr = format!("{addr:08X}"),
+ phys_addr = format!("{phys:08X}"),
+ size = 4,
+ "Unimplemented MMIO read"
+ );
self.mmio.phys_read_u32(phys)
}
+ _ => self.mmio.phys_read_u32(phys),
}
}
@@ -687,6 +726,23 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
);
}
}
+ IPC_BASE..=IPC_END if SYSTEM == WII => {
+ crate::hollywood::ipc::ipc_write(self, phys, 1, raw);
+ }
+ HOLLYWOOD_IRQ_BASE..=HOLLYWOOD_IRQ_END if SYSTEM == WII => {
+ crate::hollywood::irq::irq_write(self, phys, 1, raw);
+ }
+ HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
+ tracing::warn!(
+ device = "HOLLYWOOD",
+ addr = format!("{addr:08X}"),
+ phys_addr = format!("{phys:08X}"),
+ val = format!("{raw:08X}"),
+ size = 1,
+ "Unimplemented MMIO write"
+ );
+ self.mmio.phys_write_u8(phys, val);
+ }
GX_FIFO_BASE..=GX_FIFO_END => {
let wptr = self.pi.fifo_wptr as usize;
self.mmio.ram[wptr] = val;
@@ -696,19 +752,18 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
self.check_gx_pe_interrupts();
}
}
- _ => {
- if (HW_REG_BASE..=HW_REG_END).contains(&phys) {
- tracing::warn!(
- device = "HW_REG",
- addr = format!("{addr:08X}"),
- phys_addr = format!("{phys:08X}"),
- val = format!("{raw:08X}"),
- size = 1,
- "Unimplemented MMIO write"
- );
- }
+ HW_REG_BASE..=HW_REG_END => {
+ tracing::warn!(
+ device = "HW_REG",
+ addr = format!("{addr:08X}"),
+ phys_addr = format!("{phys:08X}"),
+ val = format!("{raw:08X}"),
+ size = 1,
+ "Unimplemented MMIO write"
+ );
self.mmio.phys_write_u8(phys, val);
}
+ _ => self.mmio.phys_write_u8(phys, val),
}
}
@@ -836,6 +891,23 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
);
}
}
+ IPC_BASE..=IPC_END if SYSTEM == WII => {
+ crate::hollywood::ipc::ipc_write(self, phys, 2, raw);
+ }
+ HOLLYWOOD_IRQ_BASE..=HOLLYWOOD_IRQ_END if SYSTEM == WII => {
+ crate::hollywood::irq::irq_write(self, phys, 2, raw);
+ }
+ HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
+ tracing::warn!(
+ device = "HOLLYWOOD",
+ addr = format!("{addr:08X}"),
+ phys_addr = format!("{phys:08X}"),
+ val = format!("{raw:08X}"),
+ size = 2,
+ "Unimplemented MMIO write"
+ );
+ self.mmio.phys_write_u16(phys, val);
+ }
GX_FIFO_BASE..=GX_FIFO_END => {
let wptr = self.pi.fifo_wptr as usize;
let bytes = val.to_be_bytes();
@@ -846,19 +918,18 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
self.check_gx_pe_interrupts();
}
}
- _ => {
- if (HW_REG_BASE..=HW_REG_END).contains(&phys) {
- tracing::warn!(
- device = "HW_REG",
- addr = format!("{addr:08X}"),
- phys_addr = format!("{phys:08X}"),
- val = format!("{raw:08X}"),
- size = 2,
- "Unimplemented MMIO write"
- );
- }
+ HW_REG_BASE..=HW_REG_END => {
+ tracing::warn!(
+ device = "HW_REG",
+ addr = format!("{addr:08X}"),
+ phys_addr = format!("{phys:08X}"),
+ val = format!("{raw:08X}"),
+ size = 2,
+ "Unimplemented MMIO write"
+ );
self.mmio.phys_write_u16(phys, val);
}
+ _ => self.mmio.phys_write_u16(phys, val),
}
}
@@ -985,6 +1056,23 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
);
}
}
+ IPC_BASE..=IPC_END if SYSTEM == WII => {
+ crate::hollywood::ipc::ipc_write(self, phys, 4, val);
+ }
+ HOLLYWOOD_IRQ_BASE..=HOLLYWOOD_IRQ_END if SYSTEM == WII => {
+ crate::hollywood::irq::irq_write(self, phys, 4, val);
+ }
+ HW_HOLLYWOOD_BASE..=HW_HOLLYWOOD_END if SYSTEM == WII => {
+ tracing::warn!(
+ device = "HOLLYWOOD",
+ addr = format!("{addr:08X}"),
+ phys_addr = format!("{phys:08X}"),
+ val = format!("{val:08X}"),
+ size = 4,
+ "Unimplemented MMIO write"
+ );
+ self.mmio.phys_write_u32(phys, val);
+ }
GX_FIFO_BASE..=GX_FIFO_END => {
let wptr = self.pi.fifo_wptr as usize;
let bytes = val.to_be_bytes();
@@ -995,19 +1083,18 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
self.check_gx_pe_interrupts();
}
}
- _ => {
- if (HW_REG_BASE..=HW_REG_END).contains(&phys) {
- tracing::warn!(
- device = "HW_REG",
- addr = format!("{addr:08X}"),
- phys_addr = format!("{phys:08X}"),
- val = format!("{val:08X}"),
- size = 4,
- "Unimplemented MMIO write"
- );
- }
+ HW_REG_BASE..=HW_REG_END => {
+ tracing::warn!(
+ device = "HW_REG",
+ addr = format!("{addr:08X}"),
+ phys_addr = format!("{phys:08X}"),
+ val = format!("{val:08X}"),
+ size = 4,
+ "Unimplemented MMIO write"
+ );
self.mmio.phys_write_u32(phys, val);
}
+ _ => self.mmio.phys_write_u32(phys, val),
}
}
}
diff --git a/crates/gecko/src/mmio/constants.rs b/crates/gecko/src/mmio/constants.rs
index 46f6780..ed8dc60 100644
--- a/crates/gecko/src/mmio/constants.rs
+++ b/crates/gecko/src/mmio/constants.rs
@@ -53,3 +53,20 @@ pub const IPL_END: u32 = 0x3FFF_FFFF;
pub const LCACHE_BASE: u32 = 0xE000_0000;
pub const LCACHE_END: u32 = 0xE000_3FFF;
pub const LCACHE_SIZE: usize = 0x4000;
+
+// [Wii] MEM2 64MB at virt 0x9000_0000 / phys 0x1000_0000
+pub const MEM2_BASE: u32 = 0x1000_0000;
+pub const MEM2_END: u32 = 0x13FF_FFFF;
+pub const MEM2_SIZE: usize = 0x0400_0000;
+
+// [Wii] Hollywood register space
+pub const HW_HOLLYWOOD_BASE: u32 = 0x0D00_0000;
+pub const HW_HOLLYWOOD_END: u32 = 0x0D80_FFFF;
+
+// [Wii] IPC registers (HW_IPC_PPCMSG / PPCCTRL / ARMMSG)
+pub const IPC_BASE: u32 = 0x0D00_0000;
+pub const IPC_END: u32 = 0x0D00_000F;
+
+// [Wii] Hollywood interrupt controller
+pub const HOLLYWOOD_IRQ_BASE: u32 = 0x0D00_0030;
+pub const HOLLYWOOD_IRQ_END: u32 = 0x0D00_003F;
diff --git a/crates/gecko/src/mmio/fp.rs b/crates/gecko/src/mmio/fp.rs
index 8bde6b3..2a3b19a 100644
--- a/crates/gecko/src/mmio/fp.rs
+++ b/crates/gecko/src/mmio/fp.rs
@@ -1,4 +1,3 @@
-use crate::mmio::Mmio;
use crate::mmio::constants::RAM_END;
use crate::system::{System, SystemId};
@@ -6,7 +5,7 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
// Load a 64-bit double from memory
#[inline]
pub fn read_f64(&mut self, addr: u32) -> f64 {
- let phys = Mmio::virt_to_phys(addr);
+ let phys = crate::mmio::virt_to_phys(addr);
if phys <= RAM_END - 7 {
return f64::from_bits(self.mmio.ram_read_u64(phys));
}
@@ -19,7 +18,7 @@ impl<const SYSTEM: SystemId> System<SYSTEM> {
/// Store a 64-bit double to memory
#[inline]
pub fn write_f64(&mut self, addr: u32, val: f64) {
- let phys = Mmio::virt_to_phys(addr);
+ let phys = crate::mmio::virt_to_phys(addr);
let bits = val.to_bits();
if phys <= RAM_END - 7 {
self.mmio.ram_write_u64(phys, bits);
diff --git a/crates/gecko/src/mmio/macros.rs b/crates/gecko/src/mmio/macros.rs
index ef11199..5253e3a 100644
--- a/crates/gecko/src/mmio/macros.rs
+++ b/crates/gecko/src/mmio/macros.rs
@@ -52,7 +52,7 @@ macro_rules! mmio_device_dispatch {
macro_rules! mmio_reg {
($name:ident : $raw:tt @ $addr:tt) => {
impl $crate::mmio::traits::MmioRegister for $name {
- const ADDR: u32 = $crate::mmio::Mmio::virt_to_phys($addr);
+ const ADDR: u32 = $crate::mmio::virt_to_phys($addr);
const SIZE: usize = ::core::mem::size_of::<$raw>();
#[inline(always)]
fn from_raw(raw: u32) -> Self {
diff --git a/crates/gecko/src/system.rs b/crates/gecko/src/system.rs
index b9f217e..9c4bfb9 100644
--- a/crates/gecko/src/system.rs
+++ b/crates/gecko/src/system.rs
@@ -28,7 +28,7 @@ pub struct System<const SYSTEM: SystemId> {
pub vsync_pending: bool,
pub gekko: Gekko,
pub scheduler: Scheduler<SYSTEM>,
- pub mmio: Mmio,
+ pub mmio: Mmio<SYSTEM>,
pub vi: VideoInterface,
pub pe: PixelEngine,
pub pi: ProcessorInterface,
diff --git a/crates/scripting/src/lib.rs b/crates/scripting/src/lib.rs
index c7a44b9..24ae266 100644
--- a/crates/scripting/src/lib.rs
+++ b/crates/scripting/src/lib.rs
@@ -275,7 +275,7 @@ impl LuaHost {
Ok(())
});
methods.add_method("virt_to_phys", |_, _this, addr: u32| {
- Ok(gecko::mmio::Mmio::virt_to_phys(addr))
+ Ok(gecko::mmio::virt_to_phys(addr))
});
}
diff --git a/crates/tinytracer/src/dump.rs b/crates/tinytracer/src/dump.rs
index b18eb2a..aa4d5b6 100644
--- a/crates/tinytracer/src/dump.rs
+++ b/crates/tinytracer/src/dump.rs
@@ -71,7 +71,7 @@ pub fn registers(curr: &CpuSnapshot, prev: &CpuSnapshot) {
println!();
}
-pub fn memory(mmio: &gecko::mmio::Mmio, addr: u32) {
+pub fn memory<const SYSTEM: gecko::SystemId>(mmio: &gecko::mmio::Mmio<SYSTEM>, addr: u32) {
let aligned_addr = addr & !0xF;
let start = aligned_addr.wrapping_sub(0x40);
let data = mmio.virt_slice(start, 0x80);
diff --git a/crates/web/Cargo.lock b/crates/web/Cargo.lock
index 188ceb5..fe27f76 100644
--- a/crates/web/Cargo.lock
+++ b/crates/web/Cargo.lock
@@ -328,22 +328,18 @@ dependencies = [
[[package]]
name = "chipi-build"
-version = "0.8.2"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2676885c88403477d9053fc020668dd50d352bd05c8ff4668a276f79655c3550"
+checksum = "bc93ee723a2e1024de5fdcb59d2dfac6e06edf9a9ad7a3941920d5d9296b8fdc"
dependencies = [
"chipi-core",
]
[[package]]
name = "chipi-core"
-version = "0.8.2"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c00155ee6a20d40473b212f6b33d20d14525b47df5f5628e609b05c78272833"
-dependencies = [
- "serde",
- "toml",
-]
+checksum = "7c334634fcf9d942efa6f676b81d3dbf14c0bcf94fede78738d02a09eb3cc30a"
[[package]]
name = "codespan-reporting"
@@ -838,6 +834,7 @@ checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
dependencies = [
"crc32fast",
"miniz_oxide",
+ "zlib-rs",
]
[[package]]
@@ -1211,6 +1208,8 @@ name = "image"
version = "0.1.0"
dependencies = [
"zerocopy",
+ "zip",
+ "zstd",
]
[[package]]
@@ -2460,15 +2459,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "serde_spanned"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
-dependencies = [
- "serde_core",
-]
-
[[package]]
name = "sha3"
version = "0.10.8"
@@ -2738,21 +2728,6 @@ dependencies = [
"zerovec",
]
-[[package]]
-name = "toml"
-version = "1.1.2+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
-dependencies = [
- "indexmap",
- "serde_core",
- "serde_spanned",
- "toml_datetime",
- "toml_parser",
- "toml_writer",
- "winnow",
-]
-
[[package]]
name = "toml_datetime"
version = "1.1.1+spec-1.1.0"
@@ -2783,12 +2758,6 @@ dependencies = [
"winnow",
]
-[[package]]
-name = "toml_writer"
-version = "1.1.1+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
-
[[package]]
name = "tracing"
version = "0.1.44"
@@ -2844,6 +2813,12 @@ dependencies = [
"rustc-hash 2.1.2",
]
+[[package]]
+name = "typed-path"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e28f89b80c87b8fb0cf04ab448d5dd0dd0ade2f8891bae878de66a75a28600e"
+
[[package]]
name = "typenum"
version = "1.19.0"
@@ -3819,3 +3794,63 @@ dependencies = [
"quote",
"syn",
]
+
+[[package]]
+name = "zip"
+version = "8.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d04a6b5381502aa6087c94c669499eb1602eb9c5e8198e534de571f7154809b"
+dependencies = [
+ "crc32fast",
+ "flate2",
+ "indexmap",
+ "memchr",
+ "typed-path",
+ "zopfli",
+]
+
+[[package]]
+name = "zlib-rs"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513"
+
+[[package]]
+name = "zopfli"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "log",
+ "simd-adler32",
+]
+
+[[package]]
+name = "zstd"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "7.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
+dependencies = [
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.16+zstd.1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748"
+dependencies = [
+ "cc",
+ "pkg-config",
+]