name refactor
This commit is contained in:
parent
b43d046433
commit
ead9e4286a
@ -1,5 +1,5 @@
|
|||||||
pub mod hardware;
|
pub mod hardware;
|
||||||
pub mod vm;
|
pub mod virtual_machine;
|
||||||
mod model;
|
mod model;
|
||||||
pub mod firmware;
|
pub mod firmware;
|
||||||
mod prometeu_os;
|
mod prometeu_os;
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
use crate::vm::Program;
|
use crate::virtual_machine::Program;
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct AppHeader {
|
pub struct AppHeader {
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
mod prometeu_os;
|
mod prometeu_os;
|
||||||
|
|
||||||
pub use prometeu_os::PrometeuOS;
|
pub use prometeu_os::PrometeuOS;
|
||||||
pub use crate::vm::native_interface::NativeInterface;
|
pub use crate::virtual_machine::native_interface::NativeInterface;
|
||||||
@ -1,6 +1,6 @@
|
|||||||
use crate::model::{Cartridge, Color, Sample};
|
use crate::model::{Cartridge, Color, Sample};
|
||||||
use crate::hardware::{HardwareBridge, InputSignals};
|
use crate::hardware::{HardwareBridge, InputSignals};
|
||||||
use crate::vm::{Value, VirtualMachine};
|
use crate::virtual_machine::{Value, VirtualMachine};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use crate::prometeu_os::NativeInterface;
|
use crate::prometeu_os::NativeInterface;
|
||||||
|
|
||||||
@ -70,7 +70,7 @@ impl PrometeuOS {
|
|||||||
|
|
||||||
match run_result {
|
match run_result {
|
||||||
Ok(run) => {
|
Ok(run) => {
|
||||||
if run.reason == crate::vm::LogicalFrameEndingReason::FrameSync {
|
if run.reason == crate::virtual_machine::LogicalFrameEndingReason::FrameSync {
|
||||||
hw.gfx_mut().render_all();
|
hw.gfx_mut().render_all();
|
||||||
self.end_logical_frame(hw);
|
self.end_logical_frame(hw);
|
||||||
self.logical_frame_index += 1;
|
self.logical_frame_index += 1;
|
||||||
@ -159,7 +159,7 @@ impl NativeInterface for PrometeuOS {
|
|||||||
match id {
|
match id {
|
||||||
// system.has_cart() -> bool
|
// system.has_cart() -> bool
|
||||||
0x0001 => {
|
0x0001 => {
|
||||||
// vm.push(Value::Boolean(self.current_cartridge.is_some()));
|
// virtual_machine.push(Value::Boolean(self.current_cartridge.is_some()));
|
||||||
Ok(10)
|
Ok(10)
|
||||||
}
|
}
|
||||||
// system.run_cart()
|
// system.run_cart()
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
use crate::hardware::HardwareBridge;
|
use crate::hardware::HardwareBridge;
|
||||||
use crate::vm::VirtualMachine;
|
use crate::virtual_machine::VirtualMachine;
|
||||||
|
|
||||||
pub trait NativeInterface {
|
pub trait NativeInterface {
|
||||||
fn syscall(&mut self, id: u32, vm: &mut VirtualMachine, hw: &mut dyn HardwareBridge) -> Result<u64, String>;
|
fn syscall(&mut self, id: u32, vm: &mut VirtualMachine, hw: &mut dyn HardwareBridge) -> Result<u64, String>;
|
||||||
@ -1,5 +1,5 @@
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use crate::vm::Value;
|
use crate::virtual_machine::Value;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Default)]
|
#[derive(Debug, Clone, Default)]
|
||||||
pub struct Program {
|
pub struct Program {
|
||||||
@ -1,9 +1,9 @@
|
|||||||
use crate::hardware::HardwareBridge;
|
use crate::hardware::HardwareBridge;
|
||||||
use crate::prometeu_os::NativeInterface;
|
use crate::prometeu_os::NativeInterface;
|
||||||
use crate::vm::call_frame::CallFrame;
|
use crate::virtual_machine::call_frame::CallFrame;
|
||||||
use crate::vm::opcode::OpCode;
|
use crate::virtual_machine::opcode::OpCode;
|
||||||
use crate::vm::value::Value;
|
use crate::virtual_machine::value::Value;
|
||||||
use crate::vm::Program;
|
use crate::virtual_machine::Program;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
pub enum LogicalFrameEndingReason {
|
pub enum LogicalFrameEndingReason {
|
||||||
Loading…
x
Reference in New Issue
Block a user