Skip to content

Commit 8117506

Browse files
Final updates.
1 parent 9504851 commit 8117506

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

slides.md

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,6 @@ Let's play higher-lower
144144

145145
---
146146

147-
# So an application just runs on the CPU?
148-
149-
- Yes, and no.
150-
* How much memory do you have?
151-
* What I/O devices do you have?
152-
* Is that the same as what the author had?
153-
* Do you really want to write everything from scratch?
154-
155-
---
156-
157147
# What does a DOS do?
158148

159149
- It runs applications ✅
@@ -487,7 +477,7 @@ Microsoft said sorry with $100M + added DEC Alpha port
487477
* ~~Apple System/Carbon~~
488478
* Microsoft Windows NT (Win32)
489479
* POSIX (Portable Operating System Interface ... X?)
490-
* ... WASI?
480+
* Your web browser...?
491481

492482
---
493483

@@ -715,7 +705,7 @@ static mut API: Option<&'static Api> = None;
715705
static mut VGA_CONSOLE: Option<VgaConsole> = None;
716706

717707
#[no_mangle]
718-
pub extern "C" fn main(api: &'static Api) -> !
708+
pub extern "C" fn main(api: &'static BiosApi) -> !
719709
unsafe {
720710
API = Some(api);
721711
VGA_CONSOLE = Some(VgaConsole::new(api));
@@ -735,7 +725,7 @@ static API: ApiWrapper = ApiWrapper::new();
735725
static VGA_CONSOLE: VgaConsole = VgaConsole::new();
736726

737727
#[no_mangle]
738-
pub extern "C" fn main(api: &'static Api) -> !
728+
pub extern "C" fn main(api: &'static BiosApi) -> !
739729
API.init(api);
740730
VGA_CONSOLE.init();
741731
let version = API.get_version();
@@ -749,9 +739,11 @@ pub extern "C" fn main(api: &'static Api) -> !
749739
# DOS / Application ABI
750740

751741
* Works the same way
752-
* Entry point gets `*const OsApi`
742+
* Entry point gets `&'static OsApi`
753743
* CRT sets up args/env and calls normal C-style `main`
754744

745+
<!-- Rust-run-time? -->
746+
755747
---
756748

757749
# Where is Neotron at right now?

0 commit comments

Comments
 (0)