Create test tool

Fix asm
2024-01-10 20:40:50 -05:00 · 2024-01-10 20:24:29 -05:00
7 changed files with 362 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-/target
+**/target
 /Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,3 +1,5 @@
+workspace = { members = ["ecplorer"] }
+
 [package]
 name = "smokepatio"
 version = "0.1.0"
--- a/ecplorer/Cargo.lock
+++ b/ecplorer/Cargo.lock
@ -0,0 +1,269 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "anstream"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "clap"
+version = "4.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33e92c5c1a78c62968ec57dbc2440366a2d6e5a23faf829970ff1585dc6b18e2"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap-num"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488557e97528174edaa2ee268b23a809e0c598213a4bbcb4f34575a46fda147e"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4323769dc8a61e2c39ad7dc26f6f2800524691a44d74fe3d1071a5c24db6370"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
+[[package]]
+name = "ecplorer"
+version = "0.1.0"
+dependencies = [
+ "clap",
+ "clap-num",
+ "smokepatio",
+]
+
+[[package]]
+name = "embedded-io"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "num-traits"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "smokepatio"
+version = "0.1.0"
+dependencies = [
+ "embedded-io",
+ "log",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "2.0.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
--- a/ecplorer/Cargo.toml
+++ b/ecplorer/Cargo.toml
@ -0,0 +1,12 @@
+[package]
+name = "ecplorer"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+smokepatio = { version = "0.1", path = "../" }
+
+clap = { version = "4.4", features = [ "derive" ] }
+clap-num = "1.0"
--- a/ecplorer/src/args.rs
+++ b/ecplorer/src/args.rs
@ -0,0 +1,53 @@
+use clap::{Parser, Subcommand};
+
+#[derive(Parser, Debug)]
+#[command(author, version, about, long_about = None)]
+pub struct Args {
+    /// Port address of ec data
+    #[arg(short, long, value_parser = clap_num::maybe_hex::<u16>)]
+    pub data_address: u16,
+
+    /// Port address of ec cmd
+    #[arg(short, long, value_parser = clap_num::maybe_hex::<u16>)]
+    pub cmd_address: u16,
+
+    /// Use 16-bit addresses instead of 8-bit
+    #[arg(short, long)]
+    pub extended: bool,
+
+    /// Operation to perform
+    #[command(subcommand)]
+    pub op: Operation,
+}
+
+impl Args {
+    pub fn load() -> Self {
+        Self::parse()
+    }
+}
+
+#[derive(Subcommand, Debug)]
+pub enum Operation {
+    /// Read whole address space, printing values
+    ReadAll,
+    /// Read a specific address
+    Read {
+        /// Address of embedded controller to read from
+        #[arg(value_parser = clap_num::maybe_hex::<u16>)]
+        address: u16,
+    },
+    /// Write a pattern to the whole address space
+    WritePattern {
+        // TODO
+    },
+    /// Write a value to a specific address
+    Write {
+        /// Address of embedded controller to write
+        #[arg(value_parser = clap_num::maybe_hex::<u16>)]
+        address: u16,
+
+        /// Value to write
+        #[arg(value_parser = clap_num::maybe_hex::<u8>)]
+        value: u8,
+    },
+}
--- a/ecplorer/src/main.rs
+++ b/ecplorer/src/main.rs
@ -0,0 +1,20 @@
+mod args;
+
+use smokepatio::ec::EmbeddedController;
+
+fn main() {
+    let cli = args::Args::load();
+    println!("args: {:?}", cli);
+
+    let mut ec = EmbeddedController::new(cli.data_address, cli.cmd_address);
+    match cli.op {
+        args::Operation::ReadAll => todo!(),
+        args::Operation::Read { address } => {
+            println!("{:#02x}", ec.get(address));
+        },
+        args::Operation::WritePattern {  } => todo!(),
+        args::Operation::Write { address, value } => {
+            ec.set(address, value);
+        },
+    }
+}
--- a/src/ec/ports.rs
+++ b/src/ec/ports.rs
@ -1,8 +1,10 @@
 // x86 and x86_64
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
 pub(crate) fn outb(port: u16, val: u8) {
+    //let val: i16 = val.into();
    unsafe {
-        std::arch::asm!("outb", in("dx") port, in("al") val);
+        std::arch::asm!("out dx, al", in("dx") port, in("al") val);
+        //std::arch::asm!("outb %al, %dx", in("al") val, in("dx") port, options(att_syntax));
    }
 }

@ -10,7 +12,8 @@ pub(crate) fn outb(port: u16, val: u8) {
 pub(crate) fn inb(port: u16) -> u8 {
    let out: u8;
    unsafe {
-        std::arch::asm!("inb", in("dx") port, lateout("al") out);
+        std::arch::asm!("in al, dx", in("dx") port, lateout("al") out);
+        // asm!("inb %dx, %al", in("dx") port, out("al") ret, options(att_syntax));
    }
    out
 }
Author	SHA1	Message	Date
NGnius (Graham)	b7fb4de8ff	Create test tool	2024-01-10 20:40:50 -05:00
NGnius (Graham)	23209f13e0	Fix asm	2024-01-10 20:24:29 -05:00