Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify #28

Merged
merged 9 commits into from
Mar 29, 2021
Merged

Simplify #28

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fb5c114
Colocate `const`s
Urhengulas Mar 28, 2021
ed816d2
Update deps
Urhengulas Mar 28, 2021
bd94efb
Simplify `fn notmain()`
Urhengulas Mar 28, 2021
fbc0cd5
Split computation of span of RAM sections into own fn
Urhengulas Mar 28, 2021
b652cef
Simplify `struct MemoryEntry`
Urhengulas Mar 28, 2021
45a96f9
Improve docs
Urhengulas Mar 28, 2021
5df1311
Simplify `fn get_linker_script`
Urhengulas Mar 28, 2021
8c65eb0
Iteratorize `fn get_linker_scripts`
Urhengulas Mar 28, 2021
d9bdad5
Update src/main.rs
Urhengulas Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve docs
  • Loading branch information
@Urhengulas
Urhengulas committed Mar 28, 2021
commit 45a96f9e207521f0bac9dfb09e2b14e58c1be50c
3 changes: 2 additions & 1 deletion src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ impl MemoryEntry {
}
}

/// Rm `token` from beginning of `line`, else `continue` loop iteration
macro_rules! eat {
($line:expr, $token:expr) => {
if $line.starts_with($token) {
Expand All @@ -303,7 +304,7 @@ fn get_includes_from_linker_script(linker_script: &str) -> Vec<&str> {
includes
}

// looks for "RAM : ORIGIN = $origin, LENGTH = $length"
/// Looks for "RAM : ORIGIN = $origin, LENGTH = $length"
// FIXME this is a dumb line-by-line parser
fn find_ram_in_linker_script(linker_script: &str) -> Option<MemoryEntry> {
macro_rules! tryc {
Expand Down