-
Notifications
You must be signed in to change notification settings - Fork 824
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
Fix #2389. Replace Rip
with Eip
for windows
#2390
Conversation
lib/vm/src/trap/traphandlers.rs
Outdated
@@ -341,7 +341,7 @@ cfg_if::cfg_if! { | |||
None => return EXCEPTION_CONTINUE_SEARCH, | |||
}; | |||
let jmp_buf = info.handle_trap( | |||
(*(*exception_info).ContextRecord).Rip as *const u8, | |||
(*(*exception_info).ContextRecord).Eip as *const u8, |
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.
I believe Rip exists in 64-bit Windows environments. Can we have a cfg flag to choose one or the other (Rip
in 64 bit Windows, Eip
in 32 bit ones) depending on the bits of the system?
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.
Ok, will update it!
Use target pointer width to determine 32 or 64 bit system and choose either Eip or Rip respectively for getting the program counter.
Awesome... looks great! bors r+ |
Rip
does not exist,Eip
.This now seems to compile, but for me it generates an error during
linking, but I'm not sure if that's just me. But this at least fixes the compilation part of the error.
Namely: