Commit Graph

364 Commits

Author SHA1 Message Date
Philipp Oppermann
bbeb63ec3d Merge branch 'post-07' into post-08 2019-05-23 12:39:35 +02:00
Philipp Oppermann
fe35a21965 Merge branch 'post-06' into post-07 2019-05-23 12:39:35 +02:00
Philipp Oppermann
7a45083975 Merge branch 'post-05' into post-06 2019-05-23 12:39:35 +02:00
Philipp Oppermann
2faeaa8964 Merge branch 'post-04' into post-05 2019-05-23 12:39:35 +02:00
Philipp Oppermann
c8d1bbeef8 Update code for PR #611
PR at https://github.com/phil-opp/blog_os/pull/611
2019-05-22 12:43:15 +02:00
Philipp Oppermann
a4a7b5e8d6 Merge branch 'post-07' into post-08 2019-05-09 15:38:47 +02:00
Philipp Oppermann
13923c59f2 Fix: Make keyboard port mutable
This is required because of the update to x86_64 0.7.0 (see #606).
2019-05-09 15:38:34 +02:00
Philipp Oppermann
01040fc643 Merge branch 'post-05' into post-06 2019-05-09 14:59:55 +02:00
Philipp Oppermann
2dfc5e838a Merge branch 'post-04' into post-05 2019-05-09 14:59:55 +02:00
Philipp Oppermann
189ab7d0d8 Merge branch 'post-07' into post-08 2019-05-09 14:59:55 +02:00
Philipp Oppermann
09be8647d5 Merge branch 'post-06' into post-07 2019-05-09 14:59:55 +02:00
bors[bot]
158aed0c18 Merge #604 #606
604: Use `-serial stdio` instead of `-serial mon:stdio` r=phil-opp a=phil-opp

Fixes #602 

Post update in https://github.com/phil-opp/blog_os/pull/605

606: Update x86_64 to version 0.7.0 r=phil-opp a=phil-opp

[Changelog](https://github.com/rust-osdev/x86_64/blob/master/Changelog.md#070):

- **Breaking**: `Port::read` and `PortReadOnly::read` now take `&mut self` instead of `&self` ([#76](https://github.com/rust-osdev/x86_64/pull/76)).

Post update in https://github.com/phil-opp/blog_os/pull/607

Co-authored-by: Philipp Oppermann <dev@phil-opp.com>
2019-05-09 12:42:42 +00:00
Philipp Oppermann
3098be9653 Update x86_64 to version 0.7.0 2019-05-09 14:37:18 +02:00
Philipp Oppermann
86b57f696f Use -serial stdio instead of -serial mon:stdio 2019-05-08 16:10:23 +02:00
Philipp Oppermann
5a68816b45 Merge branch 'post-05' into post-06 2019-05-03 18:36:45 +02:00
Philipp Oppermann
12c08d72e4 Merge branch 'post-04' into post-05 2019-05-03 18:36:45 +02:00
Philipp Oppermann
a2beb9d2a6 Merge branch 'post-07' into post-08 2019-05-03 18:36:45 +02:00
Philipp Oppermann
a2d36342c1 Merge branch 'post-06' into post-07 2019-05-03 18:36:45 +02:00
Philipp Oppermann
ac9b661395 Update to x86_64 0.6.0 2019-05-03 18:36:39 +02:00
Philipp Oppermann
667c093594 Merge branch 'post-07-new' into post-08-new 2019-04-26 15:50:02 +02:00
Philipp Oppermann
abf640254a Merge branch 'post-06-new' into post-07-new 2019-04-26 15:49:43 +02:00
Philipp Oppermann
111c3e1029 Comment out stack_overflow() call to keep cargo xtest working 2019-04-26 15:48:59 +02:00
Philipp Oppermann
62f913facc Move test_main call to end of _start 2019-04-26 15:27:48 +02:00
Philipp Oppermann
d6f48d72aa Remove duplicated import 2019-04-26 15:27:48 +02:00
Philipp Oppermann
2784998301 Update post number for Readme badge 2019-04-26 15:27:05 +02:00
Philipp Oppermann
6099fddd54 Merge branch 'post-07-new' into post-08-new 2019-04-26 15:26:47 +02:00
Philipp Oppermann
8854b6b751 Move hlt_loop up to keep cfg(test) functions together 2019-04-26 15:25:41 +02:00
Philipp Oppermann
51cdc4db8b Use hlt_loop in lib.rs too 2019-04-26 15:25:41 +02:00
Philipp Oppermann
ae93dc18c3 Fix race condition in test_println_output test 2019-04-26 15:25:41 +02:00
Philipp Oppermann
acfdf929ad Move PIC initialization and interrupt::enable to blog_os::init 2019-04-26 15:25:41 +02:00
Philipp Oppermann
3e6f242b52 Update post number for Readme badge 2019-04-26 15:24:38 +02:00
Philipp Oppermann
ad6cb02d5c Merge branch 'post-06-new' into post-07-new-rebased 2019-04-26 15:24:28 +02:00
Philipp Oppermann
70d981e179 Simplify stack_overflow test 2019-04-26 15:14:38 +02:00
Philipp Oppermann
ee3d2219ab Disable test harness for stack_overflow test 2019-04-26 15:14:38 +02:00
Philipp Oppermann
c5a39e0902 Add a stack overflow integration test 2019-04-26 15:14:38 +02:00
Philipp Oppermann
4774893a93 Call gdt::init from blog_os::init 2019-04-26 15:14:38 +02:00
Philipp Oppermann
3c59321b54 Remove old bootimage test integration test 2019-04-26 15:14:38 +02:00
Philipp Oppermann
f5345db3e6 Update post number for Readme badge 2019-04-26 15:11:49 +02:00
Philipp Oppermann
94622ebfd5 Merge branch 'post-05-new' into post-06-new-rebased 2019-04-26 15:11:24 +02:00
Philipp Oppermann
53f3236754 Update post number for Readme badge 2019-04-26 15:09:17 +02:00
Philipp Oppermann
82014268da Merge branch 'post-05-new' into post-06-new-rebased 2019-04-26 15:05:55 +02:00
Philipp Oppermann
a5b6422785 Add a test for the breakpoint exception 2019-04-26 14:57:14 +02:00
Philipp Oppermann
b7eefae5f9 Delete old bootimage test integration tests 2019-04-26 14:57:14 +02:00
Philipp Oppermann
df8335f8c7 Add a new blog_os::init function instead of calling init_idt directly 2019-04-26 14:57:14 +02:00
Philipp Oppermann
f301ae461a Merge branch 'post-04-new' into post-05-new 2019-04-26 14:56:25 +02:00
Philipp Oppermann
ad99afae98 Fix panic_handler test by fixing line number 2019-04-26 13:42:20 +02:00
Philipp Oppermann
8374aa6ab6 Run cargo fmt 2019-04-26 13:42:20 +02:00
Philipp Oppermann
c8087cdd6f Update Readme for Testing post 2019-04-26 13:42:20 +02:00
Philipp Oppermann
ccb8b79ef8 Add a panic handler test 2019-04-26 13:42:20 +02:00
Philipp Oppermann
a55ced6b7f Add a basic test to basic_boot 2019-04-26 13:42:20 +02:00