-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #45 from rellermeyer/newvm
Revised Virtual Memory
- Loading branch information
Showing
164 changed files
with
2,338 additions
and
14,124 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,62 @@ | ||
| #these were not originally apart of the repo -- appeared after build | ||
| /kernel/kernel.bin | ||
| /kernel/flash.bin | ||
| /kernel/boot-commands | ||
| /kernel/card.sd | ||
| /kernel/src/test/test.c | ||
| /toolchain/target/ | ||
| /u-boot/u-boot-* | ||
| # Build files | ||
| kernel/kernel.bin | ||
| kernel/flash.bin | ||
| kernel/boot-commands | ||
| kernel/card.sd | ||
| kernel/src/test/test.c | ||
|
|
||
| # Toolchain dir, but not the build script | ||
| /toolchain/ | ||
| !/toolchain/build.sh | ||
|
|
||
| # Qemu dir, again without its buildscript | ||
| /qemu/ | ||
| !/qemu/build.sh | ||
|
|
||
| # Generic build dirs | ||
| build/ | ||
| /cmake-build-*/ | ||
|
|
||
| # Generated docs | ||
| /html/ | ||
| /latex/ | ||
| /course_os_docs.pdf | ||
|
|
||
| # Editor specific | ||
| .settings/ | ||
| .cproject | ||
| .project | ||
| /.idea/ | ||
| !/.idea/runConfigurations | ||
| /.vscode/ | ||
| *~ | ||
| *.swp | ||
| [._]*.s[a-w][a-z] | ||
| [._]s[a-w][a-z] | ||
| *.un~ | ||
| Session.vim | ||
| .netrwhist | ||
|
|
||
| #always exclude these from being pushed | ||
| # CCLS files | ||
| .ccls-cache/ | ||
| compile_commands.json | ||
|
|
||
| # Binary files | ||
| *.o | ||
| *.img | ||
| *.map | ||
| *.elf | ||
| *.bin | ||
| *~ | ||
| *.swp | ||
| /user/hello/hello | ||
| /user/hello/hello1 | ||
| /user/hello/hello2 | ||
| /user/libc/libc.a | ||
|
|
||
| [._]*.s[a-w][a-z] | ||
| [._]s[a-w][a-z] | ||
| *.un~ | ||
| Session.vim | ||
| .netrwhist | ||
|
|
||
| # Floobits (CLion collabrative editing plugin) | ||
| .floo | ||
| .flooignore | ||
|
|
||
| uboot-commands.ubt | ||
|
|
||
| # Misc | ||
| NOTES | ||
| /server.PID | ||
|
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| "type": "gdb", | ||
| "request": "attach", | ||
| "gdbpath": "${workspaceFolder}/toolchain/arm-none-eabi/bin/arm-none-eabi-gdb", | ||
| "name": "Debug", | ||
| "executable": "${workspaceFolder}/kernel/build/kernel.sym", | ||
| "target": ":1234", | ||
| "remote": true, | ||
| "cwd": "${workspaceRoot}", | ||
| // "preLaunchTask": "run_debug", | ||
| "valuesFormatting": "prettyPrinters" | ||
| }, | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| { | ||
| // See https://go.microsoft.com/fwlink/?LinkId=733558 | ||
| // for the documentation about the tasks.json format | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "make test", | ||
| "detail": "Runs the course_os test suite", | ||
| "type": "shell", | ||
| "command": "make test", | ||
| "problemMatcher": "$gcc", | ||
| "group": { | ||
| "kind": "test", | ||
| "isDefault": true | ||
| } | ||
| }, | ||
| { | ||
| "label": "run_debug", | ||
| "detail": "Runs qemu with gdbserver", | ||
| "type": "shell", | ||
| "command": "make -C kernel debug", | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,37 @@ | ||
| ENTRY(_Reset) | ||
|
|
||
| __KERNEL_VIRTUAL_OFFSET = 0x80000000; | ||
| __BOOT_ADDRESS = 0x8000; | ||
|
|
||
| SECTIONS | ||
| { | ||
| . = 0x8000; | ||
| P_KERNBASE = .; | ||
| .startup . : { build/common/startup.o(.text) } | ||
| .text : { *(.text) } | ||
| .data : { *(.data) } | ||
| .bss : { *(.bss COMMON) } | ||
| P_KERNTOP = .; | ||
| . = ALIGN(8); | ||
| . = . + 0x1000; | ||
| stack_top = .; | ||
| } | ||
| . = __BOOT_ADDRESS; | ||
| __BOOT_START = .; | ||
| .boot : { | ||
| */startup.o (.text) | ||
| */startup.o (.data) | ||
| */stacks.o (.text) | ||
| */startup.o (.bss) | ||
| } | ||
| __BOOT_END = .; | ||
| . += __KERNEL_VIRTUAL_OFFSET; | ||
|
|
||
| __KERNEL_BASE = .; | ||
| .text : AT(ADDR(.text) - __KERNEL_VIRTUAL_OFFSET) { | ||
| *(EXCLUDE_FILE (*/startup.o */stacks.o) .text) | ||
| *(.rodata*) | ||
| } | ||
|
|
||
| .data : AT(ADDR(.data) - __KERNEL_VIRTUAL_OFFSET){ | ||
| *(EXCLUDE_FILE (*/startup.o) .data) | ||
| } | ||
|
|
||
| .bss : AT(ADDR(.bss) - __KERNEL_VIRTUAL_OFFSET) { | ||
| *(EXCLUDE_FILE (*/startup.o) COMMON) | ||
| *(EXCLUDE_FILE (*/startup.o) .bss) | ||
| } | ||
|
|
||
| /*make kernel top megabyte aligned*/ | ||
| . = ALIGN(1024 * 1024); | ||
| __KERNEL_TOP = .; | ||
| } |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.