Skip to content

xplat: add eh frame data to thunks #1354

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

Merged
chakrabot merged 1 commit into from
Jul 29, 2016
Merged

xplat: add eh frame data to thunks #1354

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 18 additions & 15 deletions lib/Runtime/Library/amd64/JavascriptFunctionA.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,38 +108,39 @@ NESTED_END amd64_CallFunction, _TEXT


.balign 16
.text
C_FUNC(_ZN2Js18JavascriptFunction20DeferredParsingThunkEPNS_16RecyclableObjectENS_8CallInfoEz):
push rbp
NESTED_ENTRY _ZN2Js18JavascriptFunction20DeferredParsingThunkEPNS_16RecyclableObjectENS_8CallInfoEz, _TEXT, NoHandler
push_nonvol_reg rbp
lea rbp, [rsp]

// save argument registers used by custom calling convention
push rdi
push rsi
push_register rdi
push_register rsi

// Call
// JavascriptMethod JavascriptFunction::DeferredParse(ScriptFunction**)
//
lea rdi, [rbp + 10h] // &function, setup by custom calling convention
call C_FUNC(_ZN2Js18JavascriptFunction13DeferredParseEPPNS_14ScriptFunctionE)

pop rsi
pop rdi
pop rbp
pop_register rsi
pop_register rdi
pop_nonvol_reg rbp

jmp rax
Copy link
Collaborator

@obastemur obastemur Jul 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jianchun this needs to be moved before NESTED_END. Same applies to the one below. After that, perhaps it should just work. I don't see anything else problematic here. Didn't check the codes but interesting clang/ld etc didn't bother linking this one on Ubuntu..

Copy link
Author

@jianchun jianchun Jul 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@obastemur Thanks for looking! Do you mean moving jmp rax? (Was troubled by this one. Would look fine if it were a call and ret before NESTED_END. But it is a jmp.)

Copy link
Author

@jianchun jianchun Jul 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trying that, seems working fine after moved on Ubuntu


NESTED_END _ZN2Js18JavascriptFunction20DeferredParsingThunkEPNS_16RecyclableObjectENS_8CallInfoEz, _TEXT


// Var JavascriptFunction::DeferredDeserializeThunk(
// RecyclableObject* function, CallInfo callInfo, ...)
.balign 16
C_FUNC(_ZN2Js18JavascriptFunction24DeferredDeserializeThunkEPNS_16RecyclableObjectENS_8CallInfoEz):
push rbp
NESTED_ENTRY _ZN2Js18JavascriptFunction24DeferredDeserializeThunkEPNS_16RecyclableObjectENS_8CallInfoEz, _TEXT, NoHandler
push_nonvol_reg rbp
lea rbp, [rsp]

// save argument registers used by custom calling convention
push rdi
push rsi
push_register rdi
push_register rsi

// Call
// Js::JavascriptMethod JavascriptFunction::DeferredDeserialize(
Expand All @@ -148,8 +149,10 @@ C_FUNC(_ZN2Js18JavascriptFunction24DeferredDeserializeThunkEPNS_16RecyclableObje
// RDI == function, setup by custom calling convention
call C_FUNC(_ZN2Js18JavascriptFunction19DeferredDeserializeEPNS_14ScriptFunctionE)

pop rsi
pop rdi
pop rbp
pop_register rsi
pop_register rdi
pop_nonvol_reg rbp

jmp rax

NESTED_END _ZN2Js18JavascriptFunction24DeferredDeserializeThunkEPNS_16RecyclableObjectENS_8CallInfoEz, _TEXT