Compare commits
26 Commits
31a438d1ee
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
562d5ceee9 | ||
|
|
a2d66bbb4d | ||
|
|
3a6275fc53 | ||
|
|
0e423fa763 | ||
|
|
34b11aabe5 | ||
|
|
767453bd55 | ||
|
|
df8e04ce63 | ||
|
|
a8bf6749b8 | ||
|
|
e8c1313ece | ||
|
|
c1463e1fef | ||
|
|
57f8f5a118 | ||
|
|
793677a2da | ||
|
|
16f26fd552 | ||
|
|
91a609040f | ||
|
|
8f3d6b91f9 | ||
|
|
18125e6b20 | ||
|
|
395c42dff4 | ||
|
|
ad9be1029c | ||
|
|
0c7418b293 | ||
|
|
a0a99e3116 | ||
|
|
7a3e1fc37c | ||
|
|
f789d49e8a | ||
|
|
b1e7d2e3d5 | ||
|
|
d51de0cc1d | ||
|
|
9becdea2b9 | ||
|
|
2960c1b795 |
@@ -1,11 +1,5 @@
|
|||||||
Call me Terry Davis because... actually please don't. I have visions: aspirations, not hallucinations :p
|
Call me Terry Davis because... actually please don't. I have visions: aspirations, not hallucinations :p
|
||||||
|
|
||||||
# bootle
|
|
||||||
|
|
||||||
hobby kernel
|
|
||||||
|
|
||||||
status: basically nothing, come back later
|
|
||||||
|
|
||||||
# bootler
|
# bootler
|
||||||
|
|
||||||
hobby 1-stage legacy mode bootloader
|
hobby 1-stage legacy mode bootloader
|
||||||
@@ -16,4 +10,4 @@ status: gets to long mode, loads+jumps to kernel, starts idt and gdt... :)
|
|||||||
|
|
||||||
hobby self-hosted assembler
|
hobby self-hosted assembler
|
||||||
|
|
||||||
status: basically nothing, come back later
|
status: tokenises a lot of common stuff, compiles a lot of common stuff... not good enough for anything real-world yet. It can assemble its own print function!!!
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
[build]
|
|
||||||
target = "x86_64-unknown-none"
|
|
||||||
rustflags = [
|
|
||||||
"-Crelocation-model=static"
|
|
||||||
]
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
# Changelog
|
|
||||||
|
|
||||||
## [0.1.0] - 2026-03-05
|
|
||||||
|
|
||||||
### Added
|
|
||||||
|
|
||||||
- CHANGELOG.md
|
|
||||||
359
bootle/Cargo.lock
generated
359
bootle/Cargo.lock
generated
@@ -1,359 +0,0 @@
|
|||||||
# This file is automatically @generated by Cargo.
|
|
||||||
# It is not intended for manual editing.
|
|
||||||
version = 4
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "addr2line"
|
|
||||||
version = "0.25.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9acbfca36652500c911ddb767ed433e3ed99b032b5d935be73c6923662db1d43"
|
|
||||||
dependencies = [
|
|
||||||
"cpp_demangle",
|
|
||||||
"fallible-iterator",
|
|
||||||
"gimli",
|
|
||||||
"memmap2",
|
|
||||||
"object",
|
|
||||||
"rustc-demangle",
|
|
||||||
"smallvec",
|
|
||||||
"typed-arena",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "adler2"
|
|
||||||
version = "2.0.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "allocator-api2"
|
|
||||||
version = "0.2.21"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bootle"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"addr2line",
|
|
||||||
"cfg-if",
|
|
||||||
"dlmalloc",
|
|
||||||
"fortanix-sgx-abi",
|
|
||||||
"getopts",
|
|
||||||
"hashbrown",
|
|
||||||
"hermit-abi",
|
|
||||||
"object",
|
|
||||||
"r-efi",
|
|
||||||
"r-efi-alloc",
|
|
||||||
"rustc-demangle",
|
|
||||||
"rustc-literal-escaper",
|
|
||||||
"unwinding",
|
|
||||||
"wasi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "cfg-if"
|
|
||||||
version = "1.0.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "cpp_demangle"
|
|
||||||
version = "0.4.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f2bb79cb74d735044c972aae58ed0aaa9a837e85b01106a54c39e42e97f62253"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "crc32fast"
|
|
||||||
version = "1.5.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "dlmalloc"
|
|
||||||
version = "0.2.10"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "fa3a2dbee57b69fbb5dbe852fa9c0925697fb0c7fbcb1593e90e5ffaedf13d51"
|
|
||||||
dependencies = [
|
|
||||||
"cfg-if",
|
|
||||||
"libc",
|
|
||||||
"windows-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "equivalent"
|
|
||||||
version = "1.0.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fallible-iterator"
|
|
||||||
version = "0.3.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "flate2"
|
|
||||||
version = "1.1.9"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
|
|
||||||
dependencies = [
|
|
||||||
"crc32fast",
|
|
||||||
"miniz_oxide",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "foldhash"
|
|
||||||
version = "0.1.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fortanix-sgx-abi"
|
|
||||||
version = "0.6.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5efc85edd5b83e8394f4371dd0da6859dff63dd387dab8568fece6af4cde6f84"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "getopts"
|
|
||||||
version = "0.2.23"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "cba6ae63eb948698e300f645f87c70f76630d505f23b8907cf1e193ee85048c1"
|
|
||||||
dependencies = [
|
|
||||||
"unicode-width",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "gimli"
|
|
||||||
version = "0.32.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
|
|
||||||
dependencies = [
|
|
||||||
"fallible-iterator",
|
|
||||||
"stable_deref_trait",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hashbrown"
|
|
||||||
version = "0.15.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
|
|
||||||
dependencies = [
|
|
||||||
"allocator-api2",
|
|
||||||
"equivalent",
|
|
||||||
"foldhash",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "hermit-abi"
|
|
||||||
version = "0.5.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "libc"
|
|
||||||
version = "0.2.182"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "memchr"
|
|
||||||
version = "2.8.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "memmap2"
|
|
||||||
version = "0.9.10"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "miniz_oxide"
|
|
||||||
version = "0.8.9"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
|
|
||||||
dependencies = [
|
|
||||||
"adler2",
|
|
||||||
"simd-adler32",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "object"
|
|
||||||
version = "0.37.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "03fd943161069e1768b4b3d050890ba48730e590f57e56d4aa04e7e090e61b4a"
|
|
||||||
dependencies = [
|
|
||||||
"flate2",
|
|
||||||
"memchr",
|
|
||||||
"ruzstd",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "r-efi"
|
|
||||||
version = "5.3.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "r-efi-alloc"
|
|
||||||
version = "2.1.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "dc2f58ef3ca9bb0f9c44d9aa8537601bcd3df94cc9314a40178cadf7d4466354"
|
|
||||||
dependencies = [
|
|
||||||
"r-efi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "rustc-demangle"
|
|
||||||
version = "0.1.25"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "rustc-literal-escaper"
|
|
||||||
version = "0.0.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e4ee29da77c5a54f42697493cd4c9b9f31b74df666a6c04dfc4fde77abe0438b"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "ruzstd"
|
|
||||||
version = "0.8.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e5ff0cc5e135c8870a775d3320910cd9b564ec036b4dc0b8741629020be63f01"
|
|
||||||
dependencies = [
|
|
||||||
"twox-hash",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "simd-adler32"
|
|
||||||
version = "0.3.8"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "smallvec"
|
|
||||||
version = "1.15.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "stable_deref_trait"
|
|
||||||
version = "1.2.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "twox-hash"
|
|
||||||
version = "2.1.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "typed-arena"
|
|
||||||
version = "2.0.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unicode-width"
|
|
||||||
version = "0.2.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "unwinding"
|
|
||||||
version = "0.2.7"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "7d80f6c2bfede213d9a90b4a14f3eb99b84e33c52df6c1a15de0a100f5a88751"
|
|
||||||
dependencies = [
|
|
||||||
"gimli",
|
|
||||||
"libc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasi"
|
|
||||||
version = "0.11.1+wasi-snapshot-preview1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows-sys"
|
|
||||||
version = "0.59.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
|
|
||||||
dependencies = [
|
|
||||||
"windows-targets",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows-targets"
|
|
||||||
version = "0.52.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
|
|
||||||
dependencies = [
|
|
||||||
"windows_aarch64_gnullvm",
|
|
||||||
"windows_aarch64_msvc",
|
|
||||||
"windows_i686_gnu",
|
|
||||||
"windows_i686_gnullvm",
|
|
||||||
"windows_i686_msvc",
|
|
||||||
"windows_x86_64_gnu",
|
|
||||||
"windows_x86_64_gnullvm",
|
|
||||||
"windows_x86_64_msvc",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_aarch64_gnullvm"
|
|
||||||
version = "0.52.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_aarch64_msvc"
|
|
||||||
version = "0.52.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_i686_gnu"
|
|
||||||
version = "0.52.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_i686_gnullvm"
|
|
||||||
version = "0.52.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_i686_msvc"
|
|
||||||
version = "0.52.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_x86_64_gnu"
|
|
||||||
version = "0.52.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_x86_64_gnullvm"
|
|
||||||
version = "0.52.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "windows_x86_64_msvc"
|
|
||||||
version = "0.52.6"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "bootle"
|
|
||||||
version = "0.1.0"
|
|
||||||
edition = "2024"
|
|
||||||
|
|
||||||
[lib]
|
|
||||||
crate-type = ["staticlib"]
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
|
|
||||||
[profile.release]
|
|
||||||
panic = "abort"
|
|
||||||
opt-level = 'z'
|
|
||||||
debug = false
|
|
||||||
|
|
||||||
[profile.dev]
|
|
||||||
panic = "abort"
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
# bootle
|
|
||||||
|
|
||||||
hobby kernel written in rust. It's just for playing around... for now :p
|
|
||||||
|
|
||||||
run with `nix run git+https://git.mtgmonkey.net/andromeda/bootler#bootle`
|
|
||||||
|
|
||||||
### memory map
|
|
||||||
|
|
||||||
```
|
|
||||||
+------ 0x00100000 ------+
|
|
||||||
| hardware, bios stuff |
|
|
||||||
+------ 0x00080000 ------+
|
|
||||||
| |
|
|
||||||
| |
|
|
||||||
+------ 0x00010200 ------+
|
|
||||||
| kernel |
|
|
||||||
+------ 0x00010000 ------+
|
|
||||||
| bootloader stuff |
|
|
||||||
| includes stack, gdt, |
|
|
||||||
| idt for the time being |
|
|
||||||
+------ 0x00000500 ------+
|
|
||||||
| bios stuff |
|
|
||||||
+------ 0x00000000 ------+
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
this project follows [Common Changelog](https://common-changelog.org) guidelines
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
{
|
|
||||||
callPackage,
|
|
||||||
rust-bin,
|
|
||||||
naersk,
|
|
||||||
bootler,
|
|
||||||
qemu,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
rust-toolchain = rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
|
|
||||||
naersk' = callPackage naersk {
|
|
||||||
cargo = rust-toolchain;
|
|
||||||
rustc = rust-toolchain;
|
|
||||||
clippy = rust-toolchain;
|
|
||||||
};
|
|
||||||
in (naersk'.buildPackage {
|
|
||||||
src = ./.;
|
|
||||||
|
|
||||||
# deps for rust-src
|
|
||||||
additionalCargoLock = "${rust-toolchain.availableComponents.rust-src}/lib/rustlib/src/rust/library/Cargo.lock";
|
|
||||||
|
|
||||||
# just library build
|
|
||||||
copyBins = false;
|
|
||||||
copyLibs = true;
|
|
||||||
release = true;
|
|
||||||
|
|
||||||
# build std
|
|
||||||
cargoBuildOptions = x:
|
|
||||||
x
|
|
||||||
++ [
|
|
||||||
"-Zbuild-std"
|
|
||||||
];
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
ld --oformat binary \
|
|
||||||
-o kernel.bin \
|
|
||||||
-T src/linker.ld \
|
|
||||||
-e _start \
|
|
||||||
target/x86_64-unknown-none/release/libbootle.a
|
|
||||||
|
|
||||||
dd if=/dev/zero of=disk bs=512 count=2880
|
|
||||||
dd if=${bootler}/bin/boot.bin of=disk conv=notrunc
|
|
||||||
dd if=kernel.bin of=disk bs=512 seek=1 conv=notrunc
|
|
||||||
|
|
||||||
mkdir -p $out/lib
|
|
||||||
mkdir -p $out/bin
|
|
||||||
|
|
||||||
cat<<EOF>$out/bin/bootle
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
mkdir -p ./.bootle
|
|
||||||
cp $(echo $out)/bin/disk ./.bootle/disk
|
|
||||||
chmod a+w ./.bootle/disk
|
|
||||||
|
|
||||||
${qemu}/bin/qemu-system-x86_64 \
|
|
||||||
-nographic \
|
|
||||||
-drive file=./.bootle/disk,format=raw,index=0,media=disk
|
|
||||||
|
|
||||||
rm ./.bootle -r
|
|
||||||
|
|
||||||
EOF
|
|
||||||
|
|
||||||
chmod +x $out/bin/bootle
|
|
||||||
|
|
||||||
cp target/x86_64-unknown-none/release/libbootle.a $out/lib
|
|
||||||
cp kernel.bin $out/bin
|
|
||||||
cp disk $out/bin
|
|
||||||
'';
|
|
||||||
})
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
[toolchain]
|
|
||||||
channel = "nightly"
|
|
||||||
components = ["rust-src"]
|
|
||||||
targets = ["x86_64-unknown-none"]
|
|
||||||
profile = "default"
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
#![no_std]
|
|
||||||
#![no_main]
|
|
||||||
|
|
||||||
use core::panic::PanicInfo;
|
|
||||||
|
|
||||||
#[unsafe(no_mangle)]
|
|
||||||
pub extern "C" fn _start() -> ! {
|
|
||||||
welcome_serial();
|
|
||||||
halt()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn print_serial(s: &str) {
|
|
||||||
let mut bytes = s.bytes();
|
|
||||||
while let Some(b) = bytes.next() {
|
|
||||||
unsafe {
|
|
||||||
core::arch::asm!(
|
|
||||||
"out dx, al"
|
|
||||||
, in("al") b
|
|
||||||
)
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn println_serial(s: &str) {
|
|
||||||
print_serial(s);
|
|
||||||
print_serial("\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
fn welcome_serial() {
|
|
||||||
print_serial(ANSI_PINK);
|
|
||||||
println_serial("\nWelcome to Bootle OS");
|
|
||||||
println_serial("All code GPL licensed and freely available on git.mtgmonkey.net");
|
|
||||||
print_serial("Enjoy your time! Press ");
|
|
||||||
print_serial(ANSI_RED);
|
|
||||||
print_serial("ctrl+a x");
|
|
||||||
print_serial(ANSI_PINK);
|
|
||||||
println_serial(" to escape Qemu");
|
|
||||||
print_serial(ANSI_CLEAR);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[panic_handler]
|
|
||||||
fn panic(_: &PanicInfo) -> ! {
|
|
||||||
print_serial("panicked");
|
|
||||||
halt()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn halt() -> ! {
|
|
||||||
unsafe { core::arch::asm!("hlt") };
|
|
||||||
halt()
|
|
||||||
}
|
|
||||||
|
|
||||||
const ANSI_CLEAR: &str = "\x1b[0m";
|
|
||||||
const ANSI_RED: &str = "\x1b[31m";
|
|
||||||
const ANSI_PINK: &str = "\x1b[35m";
|
|
||||||
const ANSI_GREEN: &str = "\x1b[32m";
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
SECTIONS
|
|
||||||
{
|
|
||||||
. = 0x00010000;
|
|
||||||
.text : {
|
|
||||||
*(.text._start)
|
|
||||||
*(.text*)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -6,7 +6,7 @@
|
|||||||
LOAD_ADDR equ 0x7C00
|
LOAD_ADDR equ 0x7C00
|
||||||
|
|
||||||
KERNEL_START equ 2 ; first sector on disk to load kernel from; 1 indexed
|
KERNEL_START equ 2 ; first sector on disk to load kernel from; 1 indexed
|
||||||
KERNEL_SIZE equ 16 ; length of kernel in sectors
|
KERNEL_SIZE equ 32 ; length of kernel in sectors
|
||||||
KERNEL_LOAD_ADDR_ES equ 0x1000 ; kernel to be loaded at es * 0x10 + 0x0000
|
KERNEL_LOAD_ADDR_ES equ 0x1000 ; kernel to be loaded at es * 0x10 + 0x0000
|
||||||
|
|
||||||
PAGE_TABLE_LOAD_ADDR equ 0x1000 ; start of page table; 4 * pt size
|
PAGE_TABLE_LOAD_ADDR equ 0x1000 ; start of page table; 4 * pt size
|
||||||
|
|||||||
90
flake.lock
generated
90
flake.lock
generated
@@ -1,55 +1,12 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"fenix": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"naersk",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"rust-analyzer-src": "rust-analyzer-src"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1752475459,
|
|
||||||
"narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "fenix",
|
|
||||||
"rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "fenix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"naersk": {
|
|
||||||
"inputs": {
|
|
||||||
"fenix": "fenix",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1769799857,
|
|
||||||
"narHash": "sha256-88IFXZ7Sa1vxbz5pty0Io5qEaMQMMUPMonLa3Ls/ss4=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "naersk",
|
|
||||||
"rev": "9d4ed44d8b8cecdceb1d6fd76e74123d90ae6339",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "naersk",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772173633,
|
"lastModified": 1774701658,
|
||||||
"narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=",
|
"narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6",
|
"rev": "b63fe7f000adcfa269967eeff72c64cafecbbebe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -61,46 +18,7 @@
|
|||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"naersk": "naersk",
|
"nixpkgs": "nixpkgs"
|
||||||
"nixpkgs": "nixpkgs",
|
|
||||||
"rust-overlay": "rust-overlay"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"rust-analyzer-src": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1752428706,
|
|
||||||
"narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=",
|
|
||||||
"owner": "rust-lang",
|
|
||||||
"repo": "rust-analyzer",
|
|
||||||
"rev": "591e3b7624be97e4443ea7b5542c191311aa141d",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "rust-lang",
|
|
||||||
"ref": "nightly",
|
|
||||||
"repo": "rust-analyzer",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"rust-overlay": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1772507320,
|
|
||||||
"narHash": "sha256-GdGXniFvtIfRiakc+ncdQYnoQjKbTCv9Imjfl4ggquI=",
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"rev": "1775eafa1879ac098ee436849bc9c3d963206f89",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
20
flake.nix
20
flake.nix
@@ -1,39 +1,21 @@
|
|||||||
{
|
{
|
||||||
inputs = {
|
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
|
||||||
naersk = {
|
|
||||||
url = "github:nix-community/naersk";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
rust-overlay = {
|
|
||||||
url = "github:oxalica/rust-overlay";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
outputs = {
|
outputs = {
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
naersk,
|
|
||||||
rust-overlay,
|
|
||||||
self,
|
self,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
pkgsWithRustOverlay = pkgs.extend (import rust-overlay);
|
|
||||||
in {
|
in {
|
||||||
packages.${system} = {
|
packages.${system} = {
|
||||||
bootler = pkgs.callPackage ./bootler/package.nix {};
|
bootler = pkgs.callPackage ./bootler/package.nix {};
|
||||||
bootle = pkgsWithRustOverlay.callPackage ./bootle/package.nix {
|
|
||||||
inherit naersk;
|
|
||||||
bootler = self.packages.${system}.bootler;
|
|
||||||
};
|
|
||||||
twasm = pkgs.callPackage ./twasm/package.nix {
|
twasm = pkgs.callPackage ./twasm/package.nix {
|
||||||
bootler = self.packages.${system}.bootler;
|
bootler = self.packages.${system}.bootler;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
devShells.${system}.default = pkgs.mkShell {
|
devShells.${system}.default = pkgs.mkShell {
|
||||||
inputsFrom = [
|
inputsFrom = [
|
||||||
self.packages.${system}.bootle
|
|
||||||
self.packages.${system}.bootler
|
self.packages.${system}.bootler
|
||||||
self.packages.${system}.twasm
|
self.packages.${system}.twasm
|
||||||
];
|
];
|
||||||
|
|||||||
321
twasm/README.md
321
twasm/README.md
@@ -22,11 +22,14 @@ tokeniser
|
|||||||
------------------------
|
------------------------
|
||||||
byte(s) -> next byte(s)
|
byte(s) -> next byte(s)
|
||||||
------------------------
|
------------------------
|
||||||
Newline -> Newline
|
Newline -> Label
|
||||||
|
-> Newline
|
||||||
-> Komment
|
-> Komment
|
||||||
-> Operator
|
-> Operator
|
||||||
-> Directive
|
-> Directive
|
||||||
|
|
||||||
|
Label -> Newline
|
||||||
|
|
||||||
Komment -> Newline
|
Komment -> Newline
|
||||||
|
|
||||||
Operator -> Newline
|
Operator -> Newline
|
||||||
@@ -45,37 +48,6 @@ Directive -> Newline
|
|||||||
------------------------
|
------------------------
|
||||||
```
|
```
|
||||||
|
|
||||||
not yet implemented:
|
|
||||||
|
|
||||||
```
|
|
||||||
------------------------
|
|
||||||
operand parser
|
|
||||||
------------------------
|
|
||||||
byte(s) -> next byte(s)
|
|
||||||
------------------------
|
|
||||||
START -> '['
|
|
||||||
-> Register
|
|
||||||
-> Constant
|
|
||||||
|
|
||||||
'[' -> Register
|
|
||||||
-> Constant
|
|
||||||
|
|
||||||
']' -> END
|
|
||||||
|
|
||||||
Register -> IF #[, ']'
|
|
||||||
-> Operator
|
|
||||||
|
|
||||||
Constant -> IF #[, ']'
|
|
||||||
-> Operator
|
|
||||||
|
|
||||||
Operator -> IF NOT #R, Register
|
|
||||||
-> Constant
|
|
||||||
------------------------
|
|
||||||
:R: = whether a register has been found
|
|
||||||
:[: = whether a '[' has been found
|
|
||||||
------------------------
|
|
||||||
```
|
|
||||||
|
|
||||||
### memory map
|
### memory map
|
||||||
|
|
||||||
```
|
```
|
||||||
@@ -88,6 +60,10 @@ Operator -> IF NOT #R, Register
|
|||||||
+------ 0x00060000 ------+
|
+------ 0x00060000 ------+
|
||||||
| test arena |
|
| test arena |
|
||||||
+------ 0x00050000 ------+
|
+------ 0x00050000 ------+
|
||||||
|
| label table |
|
||||||
|
+------ 0x00040000 ------+
|
||||||
|
| awaiting label table |
|
||||||
|
+------ 0x00030000 ------+
|
||||||
| stack (rsp) |
|
| stack (rsp) |
|
||||||
+------------------------+
|
+------------------------+
|
||||||
| input |
|
| input |
|
||||||
@@ -105,6 +81,7 @@ each word represents a token on the token table.
|
|||||||
each token gets loaded into the token table with the following form:
|
each token gets loaded into the token table with the following form:
|
||||||
|
|
||||||
```
|
```
|
||||||
|
2 bytes
|
||||||
+----------+
|
+----------+
|
||||||
| 15 0 |
|
| 15 0 |
|
||||||
+----------+
|
+----------+
|
||||||
@@ -112,6 +89,40 @@ each token gets loaded into the token table with the following form:
|
|||||||
+----------+
|
+----------+
|
||||||
```
|
```
|
||||||
|
|
||||||
|
#### label table (LT)
|
||||||
|
|
||||||
|
label definitions are stored and recalled from this table. The memory addresses are relative to the start of the program
|
||||||
|
|
||||||
|
```
|
||||||
|
16 bytes
|
||||||
|
+----------+---------+
|
||||||
|
| 127 96 | 95 64 |
|
||||||
|
+----------+---------+
|
||||||
|
| reserved | address |
|
||||||
|
+----------+---------+
|
||||||
|
| 63 0 |
|
||||||
|
+--------------------+
|
||||||
|
| hash |
|
||||||
|
+--------------------+
|
||||||
|
```
|
||||||
|
|
||||||
|
#### awaiting label table (ALT)
|
||||||
|
|
||||||
|
forward references are stored in this table to be filled in after assembly is otherwise complete. The memory addresses are relative to the start of the program
|
||||||
|
|
||||||
|
```
|
||||||
|
16 bytes
|
||||||
|
+----------+----------+------------------+---------+
|
||||||
|
| 127 101 | 100 | 99 96 | 95 64 |
|
||||||
|
+----------+----------+------------------+---------+
|
||||||
|
| reserved | abs flag | # bytes reserved | address |
|
||||||
|
+----------+----------+------------------+---------+
|
||||||
|
| 63 0 |
|
||||||
|
+--------------------------------------------------+
|
||||||
|
| hash |
|
||||||
|
+--------------------------------------------------+
|
||||||
|
```
|
||||||
|
|
||||||
### internal data structures
|
### internal data structures
|
||||||
|
|
||||||
#### `tokens.[operators|registers]`
|
#### `tokens.[operators|registers]`
|
||||||
@@ -121,6 +132,7 @@ contains tokens by their type. Intended to be searched by token name to get the
|
|||||||
each entry is in the following form:
|
each entry is in the following form:
|
||||||
|
|
||||||
```
|
```
|
||||||
|
6 bytes
|
||||||
+----------+--------------------------------+
|
+----------+--------------------------------+
|
||||||
| 47 32 | 31 0 |
|
| 47 32 | 31 0 |
|
||||||
+----------+--------------------------------+
|
+----------+--------------------------------+
|
||||||
@@ -129,26 +141,16 @@ each entry is in the following form:
|
|||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
example implementation:
|
|
||||||
|
|
||||||
```nasm
|
|
||||||
tokens
|
|
||||||
.registers:
|
|
||||||
dd "r8"
|
|
||||||
dw 0x0008
|
|
||||||
.by_name3: ; this is required for futureproofness; the caller can use this to
|
|
||||||
; find the size of registers.by_name2
|
|
||||||
```
|
|
||||||
|
|
||||||
note that tokens longer than 4 bytes are problematic :/
|
note that tokens longer than 4 bytes are problematic :/
|
||||||
|
|
||||||
#### `tokens.by_id`
|
#### `tokens.by_id`
|
||||||
|
|
||||||
contains some tokens with their metadata. Some tokens have embedded information (`0x10XX` for instance). Those will not have entries in this table, being handled instead inside the assemble function itself.
|
contains some tokens with their metadata. Some tokens have embedded information (`0x10XX` for instance). Those do not have entries in this table, being handled instead inside the assemble function itself.
|
||||||
|
|
||||||
metadata about some tokens in the following form:
|
metadata about some tokens in the following form:
|
||||||
|
|
||||||
```
|
```
|
||||||
|
4 bytes
|
||||||
+----------------+----------+-------+----------+
|
+----------------+----------+-------+----------+
|
||||||
| 31 24 | 23 20 | 19 16 | 15 0 |
|
| 31 24 | 23 20 | 19 16 | 15 0 |
|
||||||
+----------------+----------+-------+----------+
|
+----------------+----------+-------+----------+
|
||||||
@@ -159,15 +161,17 @@ metadata about some tokens in the following form:
|
|||||||
the `type` hex digit is defined as the following:
|
the `type` hex digit is defined as the following:
|
||||||
|
|
||||||
| hex | meaning | examples |
|
| hex | meaning | examples |
|
||||||
|-----|----------|-|
|
|-----|-----------------|-|
|
||||||
| 0x0 | ignored | `; this entire comment is 1 token` |
|
| 0x0 | ignored | |
|
||||||
| 0x1 | operator | `mov`, `hlt` |
|
| 0x1 | operator | `mov`, `hlt` |
|
||||||
| 0x2 | register | `rsp`, `al` |
|
| 0x2 | register | `rsp`, `al` |
|
||||||
|
| 0x3 | pseudo-operator | `db` |
|
||||||
| 0xF | unknown | any token ID not represented in the lookup table |
|
| 0xF | unknown | any token ID not represented in the lookup table |
|
||||||
|
|
||||||
type metadata for the different types is as follows:
|
type metadata for the different types is as follows:
|
||||||
|
|
||||||
```
|
```
|
||||||
|
1 byte
|
||||||
+----------+
|
+----------+
|
||||||
| type 0x0 |
|
| type 0x0 |
|
||||||
+----------+
|
+----------+
|
||||||
@@ -178,6 +182,7 @@ type metadata for the different types is as follows:
|
|||||||
```
|
```
|
||||||
|
|
||||||
```
|
```
|
||||||
|
1 byte
|
||||||
+-------------------------------+
|
+-------------------------------+
|
||||||
| type 0x1 |
|
| type 0x1 |
|
||||||
+----------+--------------------+
|
+----------+--------------------+
|
||||||
@@ -188,6 +193,7 @@ type metadata for the different types is as follows:
|
|||||||
```
|
```
|
||||||
|
|
||||||
```
|
```
|
||||||
|
1 byte
|
||||||
+------------------------------+
|
+------------------------------+
|
||||||
| type 0x2 |
|
| type 0x2 |
|
||||||
+----------+-----------+-------+
|
+----------+-----------+-------+
|
||||||
@@ -205,18 +211,30 @@ type metadata for the different types is as follows:
|
|||||||
11b ; 64 bit
|
11b ; 64 bit
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```
|
||||||
|
1 byte
|
||||||
|
+----------+
|
||||||
|
| type 0x3 |
|
||||||
|
+----------+
|
||||||
|
| 31 24 |
|
||||||
|
+----------+
|
||||||
|
| reserved |
|
||||||
|
+----------+
|
||||||
|
```
|
||||||
|
|
||||||
#### `opcodes.by_id`
|
#### `opcodes.by_id`
|
||||||
|
|
||||||
entries are as follows:
|
entries are as follows:
|
||||||
|
|
||||||
```
|
```
|
||||||
|
16 bytes
|
||||||
+------------------------------+
|
+------------------------------+
|
||||||
| 0 operand operators |
|
| 0 operand operators |
|
||||||
+------------------------------+
|
+---------+--------------------+
|
||||||
| 127 96 |
|
| 127 120 | 119 96 |
|
||||||
+------------------------------+
|
+---------+--------------------+
|
||||||
| reserved |
|
| flags | reserved |
|
||||||
+------------------------------+
|
+---------+--------------------+
|
||||||
| 95 64 |
|
| 95 64 |
|
||||||
+------------------------------+
|
+------------------------------+
|
||||||
| reserved |
|
| reserved |
|
||||||
@@ -230,62 +248,90 @@ entries are as follows:
|
|||||||
| reserved | opcode | token ID |
|
| reserved | opcode | token ID |
|
||||||
+----------+--------+----------+
|
+----------+--------+----------+
|
||||||
|
|
||||||
+-------------------------------------------------------------+
|
16 bytes
|
||||||
|
+------------------------------------------+
|
||||||
| 1 operand operators |
|
| 1 operand operators |
|
||||||
+-------------------------------------------------------------+
|
+----------+----------+----------+---------+
|
||||||
| 127 96 |
|
| 127 120 | 119 112 | 111 104 | 103 96 |
|
||||||
+-------------------------------------------------------------+
|
+----------+----------+----------+---------+
|
||||||
| reserved |
|
| flags | reserved | flags5 | flags4 |
|
||||||
+----------+-------+-------+-------+-------+----------+-------+
|
+----------+----------+----------+---------+
|
||||||
| 95 88 | 87 84 | 83 80 | 79 76 | 75 72 | 71 68 | 67 64 |
|
| 95 88 | 87 80 | 79 72 | 71 64 |
|
||||||
+----------+-------+-------+-------+-------+----------+-------+
|
+----------+----------+----------+---------+
|
||||||
| reserved | op5&8 | op4&8 | op3&8 | op2&8 | reserved | op0&8 |
|
| flags3 | flags2 | reserved | flags0 |
|
||||||
+----------+-------+-------+-------+-------+----------+-------+
|
+----------+----------+----------+---------+
|
||||||
| 63 56 | 55 48 | 47 40 | 39 32 |
|
| 63 56 | 55 48 | 47 40 | 39 32 |
|
||||||
+----------+---------------+---------------+------------------+
|
+----------+----------+----------+---------+
|
||||||
| opcode | opcode | opcode | opcode |
|
| opcode | opcode | opcode | opcode |
|
||||||
| dst=rel8 | dest=rel | dst=imm8 | dst=imm |
|
| dst=rel8 | dst=rel | dst=imm8 | dst=imm |
|
||||||
+----------+---------------+---------------+------------------+
|
+----------+----------+----------+---------+
|
||||||
| 31 24 | 23 16 | 15 0 |
|
| 31 24 | 23 16 | 15 0 |
|
||||||
+----------+---------------+----------------------------------+
|
+----------+----------+--------------------+
|
||||||
| reserved | opcode | token ID |
|
| opcode+r | opcode | token ID |
|
||||||
| | dst=r/m | |
|
| dst=r | dst=r/m | |
|
||||||
+----------+---------------+----------------------------------+
|
+----------+----------+--------------------+
|
||||||
|
|
||||||
+----------------------------------------------+
|
16 bytes
|
||||||
|
+-----------------------------------------------+
|
||||||
| 2 operand operators |
|
| 2 operand operators |
|
||||||
+----------------------------------------------+
|
+---------+-------------------------------------+
|
||||||
| 127 96 |
|
| 127 120 | 119 96 |
|
||||||
+----------------------------------------------+
|
+---------+-------------------------------------+
|
||||||
| reserved |
|
| flags | reserved |
|
||||||
+-------------------+-------+-------+----------+
|
+---------+----------+--------------------------+
|
||||||
| 95 80 | 79 76 | 75 72 | 71 64 |
|
| 95 88 | 87 80 | 79 64 |
|
||||||
+-------------------+-------+-------+----------+
|
+---------+----------+--------------------------+
|
||||||
| reserved | op3&8 | op2&8 | reserved |
|
| flags3 | flags2 | reserved |
|
||||||
+-------------------+-------+-------+----------+
|
+---------+----------+-------+-------+----------+
|
||||||
| 63 48 | 47 40 | 39 32 |
|
| 63 48 | 47 40 | 39 32 |
|
||||||
+-------------------+---------------+----------+
|
+--------------------+---------------+----------+
|
||||||
| reserved | opcode | opcode |
|
| reserved | opcode | opcode |
|
||||||
| | dst=r/m | dst=r/m |
|
| | dst=r/m | dst=r/m |
|
||||||
| | src=imm8 | src=imm |
|
| | src=imm8 | src=imm |
|
||||||
+---------+---------+---------------+----------+
|
+---------+----------+---------------+----------+
|
||||||
| 31 24 | 23 16 | 15 0 |
|
| 31 24 | 23 16 | 15 0 |
|
||||||
+---------+---------+--------------------------+
|
+---------+----------+--------------------------+
|
||||||
| opcode | opcode | token ID |
|
| opcode | opcode | token ID |
|
||||||
| dst=r | dst=r/m | |
|
| dst=r | dst=r/m | |
|
||||||
| src=r/m | src=r | |
|
| src=r/m | src=r | |
|
||||||
+---------+---------+--------------------------+
|
+---------+----------+--------------------------+
|
||||||
|
|
||||||
|
1 byte
|
||||||
|
+-----------------+
|
||||||
|
| flags byte |
|
||||||
|
+----------+------+
|
||||||
|
| 95 89 | 88 |
|
||||||
|
+----------+------+
|
||||||
|
| reserved | 8bit |
|
||||||
|
+----------+------+
|
||||||
|
|
||||||
|
1 byte
|
||||||
|
+--------------------------------------------------------------+
|
||||||
|
| flagsX byte |
|
||||||
|
+----------+---------+-----------+-------------+---------------+
|
||||||
|
| 7 6 | 5 | 4 | 3 | 2 0 |
|
||||||
|
+----------+---------+-----------+-------------+---------------+
|
||||||
|
| reserved | +r flag | no ModR/M | 0x0F prefix | operator flag |
|
||||||
|
+----------+---------+-----------+-------------+---------------+
|
||||||
|
|
||||||
|
; flags key:
|
||||||
|
8bit ; tte has opcodes for r/m8 and r8 instead of r/m and r respectively
|
||||||
|
|
||||||
|
; flagsX key:
|
||||||
|
+r flag ; there is a +r variation of this opcode
|
||||||
|
no ModR/M ; there is no ModR/M byte for this opcode
|
||||||
|
0x0F prefix ; there is a 0x0F prefix for this opcode
|
||||||
|
operator flag ; contents of `reg` if applicable
|
||||||
|
|
||||||
; key:
|
; key:
|
||||||
r/m ; r/m 16/32/64
|
r/m ; r/m 16/32/64
|
||||||
|
r/m8 ; r/m 8
|
||||||
r ; r 16/32/64
|
r ; r 16/32/64
|
||||||
|
r8 ; r 8
|
||||||
imm ; imm 16/32
|
imm ; imm 16/32
|
||||||
imm8 ; imm 8
|
imm8 ; imm 8
|
||||||
rel ; rel 16/32
|
rel ; rel 16/32
|
||||||
rel8 ; rel 8
|
rel8 ; rel 8
|
||||||
|
|
||||||
opX&8 ; low 8 bits are the operator flag that goes with opcode at offset X from
|
|
||||||
; the first opcode in the table entry
|
|
||||||
```
|
```
|
||||||
|
|
||||||
note much room to expand. If an opcode doesn't exist, it should be 0x00
|
note much room to expand. If an opcode doesn't exist, it should be 0x00
|
||||||
@@ -296,14 +342,14 @@ supported tokens are listed below
|
|||||||
|
|
||||||
| token | id | notes |
|
| token | id | notes |
|
||||||
|-------|--------|-|
|
|-------|--------|-|
|
||||||
| rax | 0x0000 | |
|
| rax | 0x0000 | register |
|
||||||
| rbx | 0x0001 | |
|
| rbx | 0x0001 | register |
|
||||||
| rcx | 0x0002 | |
|
| rcx | 0x0002 | register |
|
||||||
| rdx | 0x0003 | |
|
| rdx | 0x0003 | register |
|
||||||
| rsi | 0x0004 | |
|
| rsi | 0x0004 | register |
|
||||||
| rdi | 0x0005 | |
|
| rdi | 0x0005 | register |
|
||||||
| rsp | 0x0006 | |
|
| rsp | 0x0006 | register |
|
||||||
| rbp | 0x0007 | |
|
| rbp | 0x0007 | register |
|
||||||
| r8 | 0x0008 | unimplemented |
|
| r8 | 0x0008 | unimplemented |
|
||||||
| r9 | 0x0009 | unimplemented |
|
| r9 | 0x0009 | unimplemented |
|
||||||
| r10 | 0x000A | unimplemented |
|
| r10 | 0x000A | unimplemented |
|
||||||
@@ -312,14 +358,14 @@ supported tokens are listed below
|
|||||||
| r13 | 0x000D | unimplemented |
|
| r13 | 0x000D | unimplemented |
|
||||||
| r14 | 0x000E | unimplemented |
|
| r14 | 0x000E | unimplemented |
|
||||||
| r15 | 0x000F | unimplemented |
|
| r15 | 0x000F | unimplemented |
|
||||||
| eax | 0x0010 | |
|
| eax | 0x0010 | register |
|
||||||
| ebx | 0x0011 | |
|
| ebx | 0x0011 | register |
|
||||||
| ecx | 0x0012 | |
|
| ecx | 0x0012 | register |
|
||||||
| edx | 0x0013 | |
|
| edx | 0x0013 | register |
|
||||||
| esi | 0x0014 | |
|
| esi | 0x0014 | register |
|
||||||
| edi | 0x0015 | |
|
| edi | 0x0015 | register |
|
||||||
| esp | 0x0016 | |
|
| esp | 0x0016 | register |
|
||||||
| ebp | 0x0017 | |
|
| ebp | 0x0017 | register |
|
||||||
| r8d | 0x0018 | unimplemented |
|
| r8d | 0x0018 | unimplemented |
|
||||||
| r9d | 0x0019 | unimplemented |
|
| r9d | 0x0019 | unimplemented |
|
||||||
| r10d | 0x001A | unimplemented |
|
| r10d | 0x001A | unimplemented |
|
||||||
@@ -328,14 +374,14 @@ supported tokens are listed below
|
|||||||
| r13d | 0x001D | unimplemented |
|
| r13d | 0x001D | unimplemented |
|
||||||
| r14d | 0x001E | unimplemented |
|
| r14d | 0x001E | unimplemented |
|
||||||
| r15d | 0x001F | unimplemented |
|
| r15d | 0x001F | unimplemented |
|
||||||
| ax | 0x0020 | unimplemented |
|
| ax | 0x0020 | register |
|
||||||
| bx | 0x0021 | unimplemented |
|
| bx | 0x0021 | register |
|
||||||
| cx | 0x0022 | unimplemented |
|
| cx | 0x0022 | register |
|
||||||
| dx | 0x0023 | unimplemented |
|
| dx | 0x0023 | register |
|
||||||
| si | 0x0024 | unimplemented |
|
| si | 0x0024 | register |
|
||||||
| di | 0x0025 | unimplemented |
|
| di | 0x0025 | register |
|
||||||
| sp | 0x0026 | unimplemented |
|
| sp | 0x0026 | register |
|
||||||
| bp | 0x0027 | unimplemented |
|
| bp | 0x0027 | register |
|
||||||
| r8w | 0x0028 | unimplemented |
|
| r8w | 0x0028 | unimplemented |
|
||||||
| r9w | 0x0029 | unimplemented |
|
| r9w | 0x0029 | unimplemented |
|
||||||
| r10w | 0x002A | unimplemented |
|
| r10w | 0x002A | unimplemented |
|
||||||
@@ -344,14 +390,14 @@ supported tokens are listed below
|
|||||||
| r13w | 0x002D | unimplemented |
|
| r13w | 0x002D | unimplemented |
|
||||||
| r14w | 0x002E | unimplemented |
|
| r14w | 0x002E | unimplemented |
|
||||||
| r15w | 0x002F | unimplemented |
|
| r15w | 0x002F | unimplemented |
|
||||||
| al | 0x0030 | unimplemented |
|
| al | 0x0030 | register |
|
||||||
| bl | 0x0031 | unimplemented |
|
| bl | 0x0031 | register |
|
||||||
| cl | 0x0032 | unimplemented |
|
| cl | 0x0032 | register |
|
||||||
| dl | 0x0033 | unimplemented |
|
| dl | 0x0033 | register |
|
||||||
| sil | 0x0034 | unimplemented |
|
| sil | 0x0034 | register |
|
||||||
| dil | 0x0035 | unimplemented |
|
| dil | 0x0035 | register |
|
||||||
| spl | 0x0036 | unimplemented |
|
| spl | 0x0036 | register |
|
||||||
| bpl | 0x0037 | unimplemented |
|
| bpl | 0x0037 | register |
|
||||||
| r8b | 0x0038 | unimplemented |
|
| r8b | 0x0038 | unimplemented |
|
||||||
| r9b | 0x0039 | unimplemented |
|
| r9b | 0x0039 | unimplemented |
|
||||||
| r10b | 0x003A | unimplemented |
|
| r10b | 0x003A | unimplemented |
|
||||||
@@ -375,28 +421,43 @@ supported tokens are listed below
|
|||||||
| cr3 | 0x004C | unimplemented |
|
| cr3 | 0x004C | unimplemented |
|
||||||
| cr4 | 0x004D | unimplemented |
|
| cr4 | 0x004D | unimplemented |
|
||||||
| cr8 | 0x004E | unimplemented |
|
| cr8 | 0x004E | unimplemented |
|
||||||
| hlt | 0x004F | |
|
| hlt | 0x004F | operator |
|
||||||
| int3 | 0x0050 | |
|
| int3 | 0x0050 | operator |
|
||||||
| | 0x0051 | deprecated; formerly `[`. Now `0x10XX` is used. |
|
| | 0x0051 | deprecated; formerly `[`. Now `0x10XX` is used. |
|
||||||
| | 0x0052 | deprecated; formerly `]`. |
|
| | 0x0052 | deprecated; formerly `]`. |
|
||||||
| xor | 0x0053 | |
|
| xor | 0x0053 | operator |
|
||||||
| inc | 0x0054 | |
|
| inc | 0x0054 | operator |
|
||||||
| dec | 0x0055 | |
|
| dec | 0x0055 | operator |
|
||||||
| mov | 0x0056 | |
|
| mov | 0x0056 | operator |
|
||||||
| add | 0x0057 | |
|
| add | 0x0057 | operator |
|
||||||
| sub | 0x0058 | |
|
| sub | 0x0058 | operator |
|
||||||
| call | 0x0059 | |
|
| call | 0x0059 | operator |
|
||||||
| ret | 0x005A | |
|
| ret | 0x005A | operator |
|
||||||
| cmp | 0x005B | |
|
| cmp | 0x005B | operator |
|
||||||
|
| jmp | 0x005C | operator |
|
||||||
|
| je | 0x005D | operator |
|
||||||
|
| jne | 0x005E | operator |
|
||||||
|
| push | 0x005F | operator |
|
||||||
|
| pop | 0x0060 | operator |
|
||||||
|
| out | 0x0061 | operator |
|
||||||
|
| db | 0x0100 | pseudo-operator |
|
||||||
| | 0x10XX | some memory address; `XX` is as specified below |
|
| | 0x10XX | some memory address; `XX` is as specified below |
|
||||||
| | 0xFEXX | used to pass some raw value `XX` in place of a token id |
|
| | 0x20XX | some constant; `XX` is as specified below |
|
||||||
|
| | 0x3XXX | some label; `XXX` is its entry index in the label table |
|
||||||
|
| | 0xFEXX | used to pass some raw value `XX` in place of a token id to a couple of functions that mention this as a feature. If the function doesn't mention it, it will lead to undefined behaviour |
|
||||||
| | 0xFFFF | unrecognised token |
|
| | 0xFFFF | unrecognised token |
|
||||||
|
|
||||||
values of `XX` in `0x10XX`:
|
values of `XX` in `0x10XX`:
|
||||||
|
|
||||||
| XX | description |
|
| XX | description |
|
||||||
|------|-------------|
|
|------|-------------|
|
||||||
| 0x00 | following byte is the token ID of some register |
|
| 0x00 | following word is the token ID of some register |
|
||||||
|
|
||||||
|
values of `XX` in `0x20XX`:
|
||||||
|
|
||||||
|
| XX | description |
|
||||||
|
|------|-------------|
|
||||||
|
| 0x00 | following 8 bytes are the constant's value |
|
||||||
|
|
||||||
### example program
|
### example program
|
||||||
|
|
||||||
|
|||||||
1956
twasm/asm/main.asm
1956
twasm/asm/main.asm
File diff suppressed because it is too large
Load Diff
@@ -295,6 +295,7 @@ test_get_opcode:
|
|||||||
|
|
||||||
mov di, 0x0053 ; xor
|
mov di, 0x0053 ; xor
|
||||||
mov sil, 0
|
mov sil, 0
|
||||||
|
mov bl, 0
|
||||||
call get_opcode
|
call get_opcode
|
||||||
cmp al, 0x31
|
cmp al, 0x31
|
||||||
jne .fail
|
jne .fail
|
||||||
@@ -303,6 +304,7 @@ test_get_opcode:
|
|||||||
|
|
||||||
mov di, 0x0053 ; xor
|
mov di, 0x0053 ; xor
|
||||||
mov sil, 1
|
mov sil, 1
|
||||||
|
mov bl, 0
|
||||||
call get_opcode
|
call get_opcode
|
||||||
cmp al, 0x33
|
cmp al, 0x33
|
||||||
jne .fail
|
jne .fail
|
||||||
@@ -311,6 +313,7 @@ test_get_opcode:
|
|||||||
|
|
||||||
mov di, 0x0053 ; xor
|
mov di, 0x0053 ; xor
|
||||||
mov sil, 2
|
mov sil, 2
|
||||||
|
mov bl, 0
|
||||||
call get_opcode
|
call get_opcode
|
||||||
cmp al, 0x81
|
cmp al, 0x81
|
||||||
jne .fail
|
jne .fail
|
||||||
@@ -319,6 +322,7 @@ test_get_opcode:
|
|||||||
|
|
||||||
mov di, 0x0053 ; xor
|
mov di, 0x0053 ; xor
|
||||||
mov sil, 3
|
mov sil, 3
|
||||||
|
mov bl, 0
|
||||||
call get_opcode
|
call get_opcode
|
||||||
cmp al, 0x83
|
cmp al, 0x83
|
||||||
jne .fail
|
jne .fail
|
||||||
@@ -327,6 +331,7 @@ test_get_opcode:
|
|||||||
|
|
||||||
mov di, 0x0054 ; inc
|
mov di, 0x0054 ; inc
|
||||||
mov sil, 0
|
mov sil, 0
|
||||||
|
mov bl, 0
|
||||||
call get_opcode
|
call get_opcode
|
||||||
cmp al, 0xFF
|
cmp al, 0xFF
|
||||||
jne .fail
|
jne .fail
|
||||||
@@ -335,6 +340,7 @@ test_get_opcode:
|
|||||||
|
|
||||||
mov di, 0x0055 ; dec
|
mov di, 0x0055 ; dec
|
||||||
mov sil, 0
|
mov sil, 0
|
||||||
|
mov bl, 0
|
||||||
call get_opcode
|
call get_opcode
|
||||||
cmp al, 0xFF
|
cmp al, 0xFF
|
||||||
jne .fail
|
jne .fail
|
||||||
@@ -343,6 +349,7 @@ test_get_opcode:
|
|||||||
|
|
||||||
mov di, 0x004F ; hlt
|
mov di, 0x004F ; hlt
|
||||||
mov sil, 0
|
mov sil, 0
|
||||||
|
mov bl, 0
|
||||||
call get_opcode
|
call get_opcode
|
||||||
cmp al, 0xF4
|
cmp al, 0xF4
|
||||||
jne .fail
|
jne .fail
|
||||||
@@ -351,6 +358,7 @@ test_get_opcode:
|
|||||||
|
|
||||||
mov di, 0x0059 ; call
|
mov di, 0x0059 ; call
|
||||||
mov sil, 0q0
|
mov sil, 0q0
|
||||||
|
mov bl, 0
|
||||||
call get_opcode
|
call get_opcode
|
||||||
cmp al, 0xFF
|
cmp al, 0xFF
|
||||||
jne .fail
|
jne .fail
|
||||||
@@ -359,6 +367,7 @@ test_get_opcode:
|
|||||||
|
|
||||||
mov di, 0x0003 ; rdx (not an operator)
|
mov di, 0x0003 ; rdx (not an operator)
|
||||||
mov sil, 0q0
|
mov sil, 0q0
|
||||||
|
mov bl, 0
|
||||||
call get_opcode
|
call get_opcode
|
||||||
cmp al, UNRECOGNISED_ID_OPCODE
|
cmp al, UNRECOGNISED_ID_OPCODE
|
||||||
jne .fail
|
jne .fail
|
||||||
@@ -483,13 +492,6 @@ test_evaluate_constant:
|
|||||||
cmp rdx, 0x03
|
cmp rdx, 0x03
|
||||||
jne .fail
|
jne .fail
|
||||||
|
|
||||||
; oversized char
|
|
||||||
mov rdi, .case1c
|
|
||||||
mov rsi, 7
|
|
||||||
call evaluate_constant
|
|
||||||
cmp rdx, 0xFF
|
|
||||||
jne .fail
|
|
||||||
|
|
||||||
.pass:
|
.pass:
|
||||||
mov rsi, msg_pass
|
mov rsi, msg_pass
|
||||||
call print
|
call print
|
||||||
@@ -654,7 +656,7 @@ test_evaluate_operand:
|
|||||||
|
|
||||||
msg_pass:
|
msg_pass:
|
||||||
db 0x0A
|
db 0x0A
|
||||||
times (TEST_LINE_LENGTH + .start + 5 - .end) db " ", ; right align
|
times (TEST_LINE_LENGTH + .start - .end) db " ", ; right align
|
||||||
db 0x1B, "[32m"
|
db 0x1B, "[32m"
|
||||||
.start db "passed."
|
.start db "passed."
|
||||||
.end db 0x1B, "[0m", 0x0A, 0x00
|
.end db 0x1B, "[0m", 0x0A, 0x00
|
||||||
|
|||||||
Reference in New Issue
Block a user