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

Jump to bottom

Use RS3d as temp_regd parameter for CHECK_WRITE macro #373

Merged
merged 2 commits into from Aug 22, 2023
Merged

Use RS3d as temp_regd parameter for CHECK_WRITE macro #373

merged 2 commits into from Aug 22, 2023

Conversation

mohanson
Copy link
Collaborator

CHECK_WRITE macro use the TEMP1 register as an internal temporary register, if we pass the TEMP1 register as the temp_regd parameter, there will be some logic errors here.

ckb-vm/src/machine/asm/execute_x64.S

Line 260 in 317b416

#define CHECK_WRITE(address_reg, temp_regd, length) \

ckb-vm/src/machine/asm/execute_x64.S

Lines 276 to 285 in 317b416

movzbl CKB_VM_ASM_ASM_CORE_MACHINE_OFFSET_FLAGS(MACHINE, TEMP1), temp_regd; \
mov temp_regd, TEMP2d; \
and $CKB_VM_ASM_MEMORY_FLAG_WXORX_BIT, temp_regd; \
cmp $CKB_VM_ASM_MEMORY_FLAG_WRITABLE, temp_regd; \
jne .exit_invalid_permission; \
or $CKB_VM_ASM_MEMORY_FLAG_DIRTY, TEMP2b; \
movb TEMP2b, CKB_VM_ASM_ASM_CORE_MACHINE_OFFSET_FLAGS(MACHINE, TEMP1); \
movq TEMP1, TEMP2; \
shr $CKB_VM_ASM_MEMORY_FRAME_PAGE_SHIFTS, TEMP1; \
movzbl CKB_VM_ASM_ASM_CORE_MACHINE_OFFSET_FRAMES(MACHINE, TEMP1), temp_regd; \

@mohanson mohanson requested a review from xxuejie August 21, 2023 23:17
@mohanson mohanson merged commit b1f7e3f into nervosnetwork:develop Aug 22, 2023
12 checks passed
@mohanson mohanson deleted the fix_temp_regd_in_check_write branch August 22, 2023 03:39
mohanson added a commit to libraries/ckb-vm that referenced this pull request Aug 22, 2023
@mohanson
Use RS3d as temp_regd parameter for CHECK_WRITE macro (nervosnetwork#373
0c0c644 
)

* Use RS3d as temp_regd for CHECK_WRITE

* Append the negative test case
mohanson added a commit to libraries/ckb-vm that referenced this pull request Aug 22, 2023
@mohanson
Use RS3d as temp_regd parameter for CHECK_WRITE macro (nervosnetwork#373
83b4769 
)

* Use RS3d as temp_regd for CHECK_WRITE

* Append the negative test case
mohanson added a commit that referenced this pull request Aug 22, 2023
@mohanson
Use RS3d as temp_regd parameter for CHECK_WRITE macro (#373) (#376)
698ad56 
* Use RS3d as temp_regd for CHECK_WRITE

* Append the negative test case
mohanson added a commit that referenced this pull request Aug 22, 2023
@mohanson
Use RS3d as temp_regd parameter for CHECK_WRITE macro (#373) (#375)
47da52e 
* Use RS3d as temp_regd for CHECK_WRITE

* Append the negative test case
@mohanson mohanson mentioned this pull request Aug 22, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xxuejie xxuejie xxuejie approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mohanson @xxuejie