Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ACS
Public
third-party
toyos-rs
Commits
37a8979b
Commit
37a8979b
authored
Nov 20, 2015
by
Eric Kidd
Browse files
Fix various mispellings and typos
parent
500c0747
Changes
3
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
37a8979b
...
...
@@ -9,7 +9,7 @@ to see what Rust feels like on bare metal.
## Building
First, we need to check out the source and rebuild the Rust runtime using
First, we need to check out the source and rebuild the Rust runtime using
a
bare-metal target and no floating point support:
```
rust
...
...
src/arch/x86_64/interrupt_handlers.asm
View file @
37a8979b
%include 'common.inc'
global
report_interrupt
global
int_handlers
global
int
errupt
_handlers
extern
rust_interrupt_handler
...
...
@@ -14,8 +14,8 @@ bits 64
jmp
trace
%endmacro
;;; Prints "INTx" in green, where "x" is a character literalpassed at the
bottom
;;; of eax.
;;; Prints "INTx" in green, where "x" is a character literal
passed at the
;;;
bottom
of eax.
trace:
shl
eax
,
16
or
eax
,
0x2f202f54
...
...
@@ -172,7 +172,7 @@ report_interrupt:
iretq
section
.rodata
int_handlers:
int
errupt
_handlers:
dq
int_entry_0
dq
int_entry_1
dq
int_entry_2
...
...
src/arch/x86_64/interrupts.rs
View file @
37a8979b
...
...
@@ -35,7 +35,7 @@ extern {
fn
report_interrupt
();
/// Interrupt handlers which call back to rust_interrupt_handler.
static
int_handlers
:
[
*
const
u8
;
IDT_ENTRY_COUNT
];
static
int
errupt
_handlers
:
[
*
const
u8
;
IDT_ENTRY_COUNT
];
}
/// Various data available on our stack when handling an interrupt.
...
...
@@ -133,7 +133,7 @@ impl Idt {
/// Fill in our IDT with our handlers.
fn
add_handlers
(
&
mut
self
)
{
for
(
index
,
&
handler
)
in
int_handlers
.iter
()
.enumerate
()
{
for
(
index
,
&
handler
)
in
int
errupt
_handlers
.iter
()
.enumerate
()
{
if
handler
!=
ptr
::
null
()
{
self
.table
[
index
]
=
IdtEntry
::
new
(
gdt64_code_offset
,
handler
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment