From 2eb988b8af391b50e137ef10779437058a7aa665 Mon Sep 17 00:00:00 2001 From: Eric-Paul Ickhorn Date: Thu, 16 Mar 2023 23:32:27 +0100 Subject: [PATCH] Restructured the project --- LICENSE | 22 ++++++++++++++++++---- README.md | 15 +++++++++++++-- src/lib.rs | 11 ----------- Cargo.toml => x86/Cargo.toml | 0 build.sh => x86/build.sh | 0 index.html => x86/index.html | 0 x86/src/i8086.rs | 10 ++++++++++ x86/src/lib.rs | 16 ++++++++++++++++ 8 files changed, 57 insertions(+), 17 deletions(-) delete mode 100644 src/lib.rs rename Cargo.toml => x86/Cargo.toml (100%) rename build.sh => x86/build.sh (100%) rename index.html => x86/index.html (100%) create mode 100644 x86/src/i8086.rs create mode 100644 x86/src/lib.rs diff --git a/LICENSE b/LICENSE index 2071b23..a0ca9a2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,9 +1,23 @@ MIT License -Copyright (c) +Copyright (c) 2023 The Original NerdEMU Authors -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, +merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 55d454d..ad6f05d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,14 @@ -# nerdemu +# NerdEMU +The NEMU / NerdEMU software for emulating simple processors in the +web using Rust & WebAssembly. + +## Original Authors +This is the list of original authors which have the full copyright +split under themselves + +Should a person be added to this list, mind the alphabetic sorting. +- antifallobst (?) +- ep.ickhorn (Eric-Paul Ickhorn) + + -The NEMU / NerdEMU software which runs in the web and emulates simple architectures. \ No newline at end of file diff --git a/src/lib.rs b/src/lib.rs deleted file mode 100644 index 1dadb36..0000000 --- a/src/lib.rs +++ /dev/null @@ -1,11 +0,0 @@ -use wasm_bindgen::prelude::*; - -#[wasm_bindgen] -extern { - pub fn alert(s: &str); -} - -#[wasm_bindgen] -pub fn greet(name: &str) { - alert(&format!("Hello, {}!", name)); -} diff --git a/Cargo.toml b/x86/Cargo.toml similarity index 100% rename from Cargo.toml rename to x86/Cargo.toml diff --git a/build.sh b/x86/build.sh similarity index 100% rename from build.sh rename to x86/build.sh diff --git a/index.html b/x86/index.html similarity index 100% rename from index.html rename to x86/index.html diff --git a/x86/src/i8086.rs b/x86/src/i8086.rs new file mode 100644 index 0000000..39f927f --- /dev/null +++ b/x86/src/i8086.rs @@ -0,0 +1,10 @@ +// The NerdEMU - emulator | This software is protected under the MIT-license +// Copyright 2023: [The Original NerdEMU-Authors] as seen on: +// (nerdcult.net/projects/nerdemu/ OR git.nerdcult.net/nerdcult/nerdemu) + +// x86/src/i8086.rs: The emulation code for the i8086 - microprocessor +// and a basic mainbus which connects it to the memory and other simple +// devices. + + + diff --git a/x86/src/lib.rs b/x86/src/lib.rs new file mode 100644 index 0000000..f866465 --- /dev/null +++ b/x86/src/lib.rs @@ -0,0 +1,16 @@ +// The NerdEMU - emulator | This software is protected under the MIT-license +// Copyright 2023: [The Original NerdEMU-Authors] as seen on: +// (nerdcult.net/projects/nerdemu/ OR git.nerdcult.net/nerdcult/nerdemu) + +use wasm_bindgen::prelude::*; + +#[wasm_bindgen] +extern { + pub fn alert(s: &str); +} + +#[wasm_bindgen] +pub fn greet(name: &str) { + alert(&format!("Hello, {}!", name)); +} +