-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
cgen: fix x86 segment-override memory operands in basic inline asm #27782
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.
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
Open
fleximus
wants to merge
2
commits into
vlang:master
Choose a base branch
from
fleximus:fix-27777-asm-segment-override
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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,6 @@ | ||
| "mov %rsp, %gs:24\n\t" | ||
| "mov %gs:16, %rsp\n\t" | ||
| "mov %%fs:8, %%rax\n\t" | ||
| "mov %%rax, %[a]\n\t" | ||
| "mov %%gs:16, %%rax\n\t" | ||
| "jne %l[over]\n\t" |
This file contains hidden or 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,43 @@ | ||
| fn basic_asm() { | ||
| // basic assembly (no operand lists) is passed through verbatim by the C | ||
| // compiler, so segment overrides must use a single, unescaped `%` | ||
| asm volatile amd64 { | ||
| mov gs:[24], rsp | ||
| mov rsp, gs:[16] | ||
| } | ||
| } | ||
|
|
||
| fn extended_asm() u64 { | ||
| // extended assembly templates are processed by the C compiler, so | ||
| // segment overrides need the escaped `%%` form there | ||
| mut a := u64(0) | ||
| asm amd64 { | ||
| mov rax, fs:[8] | ||
| mov a, rax | ||
| ; =r (a) | ||
| ; ; rax | ||
| } | ||
| return a | ||
| } | ||
|
|
||
| fn goto_asm() { | ||
| // `asm goto` blocks are emitted as extended assembly even without any | ||
| // output/input/clobber operands, so they need the escaped `%%` form too | ||
| asm goto amd64 { | ||
| mov rax, gs:[16] | ||
| cmp rax, 0 | ||
| jne over | ||
| ; ; ; ; over | ||
| } | ||
| over: | ||
| } | ||
|
|
||
| fn main() { | ||
| // guard the calls behind a runtime condition, so that running the | ||
| // program does not actually dereference the segmented addresses | ||
| if arguments().len > 1000 { | ||
| basic_asm() | ||
| println(extended_asm()) | ||
| goto_asm() | ||
| } | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In
asm gotoblocks that only provide the label list (for exampleasm goto amd64 { jmp gs:[16]; ; ; ; done }), the parser still leavesstmt.is_basictrue because it only counts outputs/inputs/clobbers, butasm_stmtemits__asm__ goto (... : : : : label), which is extended asm. This branch therefore writes%gs:instead of%%gs:, and GCC/Clang parse%gas an operand escape (operand number missing after %-letter). Please base this escaping on whether the emitted C asm is extended, includingstmt.is_goto, rather thanis_basicalone.Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@fleximus
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Codex provided feedback for a valid problem here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@medvednikov the checks failing on other code, likely due to the new parser.