Skip to content

Commit

Permalink
chore: rename midenc-runner to midenc-debug
Browse files Browse the repository at this point in the history
  • Loading branch information
bitwalker committed Aug 15, 2024
1 parent cee3b10 commit e1decee
Show file tree
Hide file tree
Showing 42 changed files with 50 additions and 50 deletions.
56 changes: 28 additions & 28 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ members = [
"hir-type",
"midenc",
"midenc-compile",
"midenc-debug",
"midenc-driver",
"midenc-session",
"midenc-runner",
"sdk/base-sys",
"tools/*",
"frontend-wasm",
Expand Down Expand Up @@ -93,7 +93,7 @@ miden-parsing = "0.1"
midenc-frontend-wasm = { version = "0.0.1", path = "frontend-wasm" }
midenc-compile = { version = "0.0.1", path = "midenc-compile" }
midenc-driver = { version = "0.0.1", path = "midenc-driver" }
midenc-runner = { version = "0.0.1", path = "midenc-runner" }
midenc-debug = { version = "0.0.1", path = "midenc-debug" }
midenc-session = { version = "0.0.1", path = "midenc-session" }
miden-integration-tests = { version = "0.0.0", path = "tests/integration" }
wat = "1.0.69"
Expand Down
4 changes: 2 additions & 2 deletions midenc-runner/Cargo.toml → midenc-debug/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "midenc-runner"
description = "The Miden VM executor that implements midenc run"
name = "midenc-debug"
description = "An interactive debugger for Miden VM programs"
version = "0.0.1"
rust-version.workspace = true
authors.workspace = true
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion midenc-driver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ log.workspace = true
midenc-hir.workspace = true
midenc-session.workspace = true
midenc-compile.workspace = true
midenc-runner.workspace = true
midenc-debug.workspace = true
thiserror.workspace = true
18 changes: 9 additions & 9 deletions midenc-driver/src/midenc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use std::{ffi::OsString, path::PathBuf, rc::Rc, sync::Arc};
use clap::{ColorChoice, Parser, Subcommand};
use log::Log;
use midenc_compile as compile;
use midenc_debug as debugger;
use midenc_hir::FunctionIdent;
use midenc_runner as runner;
use midenc_session::{
diagnostics::{Emitter, Report},
InputFile, Verbosity, Warnings,
Expand Down Expand Up @@ -93,10 +93,10 @@ enum Commands {
#[arg(long, short = 'e', value_name = "NAME")]
entrypoint: Option<FunctionIdent>,
},
/// Run a program with the Miden VM
/// Run a program under the interactive Miden VM debugger
///
/// The program will be loaded into memory and executed with the Miden VM
Run {
/// This command starts a TUI-based interactive debugger with the given program loaded.
Debug {
/// Specify the path to a Miden program file to execute.
///
/// Miden Assembly programs are emitted by the compiler with a `.masl` extension.
Expand All @@ -110,7 +110,7 @@ enum Commands {
/// access during execution. The inputs file is a JSON file which describes
/// what the inputs are, or where to source them from.
#[arg(long, value_name = "FILE")]
inputs: Option<runner::ProgramInputs>,
inputs: Option<debugger::ProgramInputs>,
/// Arguments to place on the operand stack before calling the program entrypoint.
///
/// Arguments will be pushed on the operand stack in the order of appearance,
Expand All @@ -121,9 +121,9 @@ enum Commands {
///
/// NOTE: These arguments will override any stack values provided via --inputs
#[arg(last(true), value_name = "ARGV")]
args: Vec<runner::Felt>,
args: Vec<debugger::Felt>,
#[command(flatten)]
options: runner::Runner,
options: debugger::Runner,
},
}

Expand Down Expand Up @@ -175,7 +175,7 @@ impl Midenc {
let session = options.into_session(vec![input], emitter).with_arg_matches(matches);
compile::compile(Rc::new(session))
}
Commands::Run {
Commands::Debug {
input,
inputs,
args,
Expand All @@ -186,7 +186,7 @@ impl Midenc {
}
let session = options.into_session(vec![input], emitter);
let args = args.into_iter().map(|felt| felt.0).collect();
runner::run(inputs, args, Rc::new(session), logger)
debugger::run(inputs, args, Rc::new(session), logger)
}
_ => unimplemented!(),
}
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ midenc-codegen-masm.workspace = true
midenc-session.workspace = true
midenc-compile.workspace = true
midenc-driver.workspace = true
midenc-runner.workspace = true
midenc-debug.workspace = true
miden-integration-tests-rust-fib = { path = "../rust-apps/fib" }
wasmprinter = "0.2.80"
proptest.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/src/exec_emulator.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::sync::Arc;

use midenc_codegen_masm::{Emulator, Program};
use midenc_debug::TestFelt;
use midenc_hir::{Felt, Stack};
use midenc_runner::TestFelt;

/// Execute the module using the emulator with the given arguments
/// Arguments are expected to be in the order they are passed to the entrypoint function
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use std::collections::VecDeque;

use expect_test::expect_file;
use miden_core::utils::group_slice_elements;
use midenc_debug::{MidenExecutor, PopFromStack, PushToStack, TestFelt};
use midenc_hir::Felt;
use midenc_runner::{MidenExecutor, PopFromStack, PushToStack, TestFelt};
use proptest::{
arbitrary::any,
prop_assert_eq,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use expect_test::expect_file;
use miden_assembly::LibraryPath;
use miden_core::{Felt, FieldElement};
use miden_processor::ExecutionError;
use midenc_runner::MidenExecutor;
use midenc_debug::MidenExecutor;

use crate::{execute_emulator, CompilerTestBuilder};

Expand Down
2 changes: 1 addition & 1 deletion tests/integration/src/rust_masm_tests/apps.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::collections::VecDeque;

use expect_test::expect_file;
use midenc_debug::{MidenExecutor, PopFromStack, PushToStack};
use midenc_hir::Felt;
use midenc_runner::{MidenExecutor, PopFromStack, PushToStack};
use proptest::{prelude::*, test_runner::TestRunner};

use crate::CompilerTest;
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/src/rust_masm_tests/instructions.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use expect_test::expect_file;
use midenc_runner::PushToStack;
use midenc_debug::PushToStack;
use proptest::{
prelude::*,
test_runner::{TestError, TestRunner},
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/src/rust_masm_tests/intrinsics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use core::panic;

use expect_test::expect_file;
use miden_core::Felt;
use midenc_runner::{PushToStack, TestFelt};
use midenc_debug::{PushToStack, TestFelt};
use proptest::{
arbitrary::any,
test_runner::{TestError, TestRunner},
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/src/rust_masm_tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use std::{collections::VecDeque, sync::Arc};

use miden_core::Felt;
use midenc_runner::{MidenExecutor, PopFromStack};
use midenc_debug::{MidenExecutor, PopFromStack};
use midenc_session::Session;
use proptest::{prop_assert_eq, test_runner::TestCaseError};

Expand Down

0 comments on commit e1decee

Please sign in to comment.