Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
Pyston
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
Pyston
Commits
4718b962
Commit
4718b962
authored
9 years ago
by
Kevin Modzelewski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update baseline_jit to use new patchpoint initialization
This was a merge conflict between #656 and #693
parent
fb14a8e0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
src/codegen/baseline_jit.cpp
src/codegen/baseline_jit.cpp
+6
-6
No files found.
src/codegen/baseline_jit.cpp
View file @
4718b962
...
@@ -512,15 +512,15 @@ int JitFragmentWriter::finishCompilation() {
...
@@ -512,15 +512,15 @@ int JitFragmentWriter::finishCompilation() {
SpillMap
_spill_map
;
SpillMap
_spill_map
;
uint8_t
*
start_addr
=
pp_info
.
start_addr
;
uint8_t
*
start_addr
=
pp_info
.
start_addr
;
uint8_t
*
end_addr
=
pp_info
.
end_addr
;
uint8_t
*
end_addr
=
pp_info
.
end_addr
;
std
::
pair
<
uint8_t
*
,
uint8_t
*>
p
PatchpointInitializationInfo
initialization_info
=
initializePatchpoint3
(
pp_info
.
func_addr
,
start_addr
,
end_addr
,
0
/* scratch_offset */
,
=
initializePatchpoint3
(
pp_info
.
func_addr
,
start_addr
,
end_addr
,
0
/* scratch_offset */
,
0
/* scratch_size */
,
std
::
unordered_set
<
int
>
(),
_spill_map
);
0
/* scratch_size */
,
std
::
unordered_set
<
int
>
(),
_spill_map
);
uint8_t
*
slowpath_start
=
p
.
firs
t
;
uint8_t
*
slowpath_start
=
initialization_info
.
slowpath_star
t
;
uint8_t
*
slowpath_rtn_addr
=
p
.
second
;
uint8_t
*
slowpath_rtn_addr
=
initialization_info
.
slowpath_rtn_addr
;
std
::
unique_ptr
<
ICInfo
>
pp
std
::
unique_ptr
<
ICInfo
>
pp
=
registerCompiledPatchpoint
(
=
registerCompiledPatchpoint
(
start_addr
,
slowpath_start
,
end
_addr
,
slowpath_rtn_addr
,
pp_info
.
ic
.
get
(),
start_addr
,
slowpath_start
,
initialization_info
.
continue
_addr
,
slowpath_rtn_addr
,
pp_info
.
ic
.
get
(),
pp_info
.
stack_info
,
std
::
unordered_set
<
int
>
());
pp_info
.
stack_info
,
std
::
unordered_set
<
int
>
());
pp
.
release
();
pp
.
release
();
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment