SetCPUModel go binding for setting the CPU model #1506
Merged
Conversation
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
wtdcode
reviewed
Dec 2, 2021
bindings/go/unicorn/uc.c
Outdated
| @@ -23,3 +23,7 @@ uc_err uc_reg_write_batch_helper(uc_engine *handle, int *regs, uint64_t *val_in, | |||
| free(val_ref); | |||
| return ret; | |||
| } | |||
|
|
|||
| void uc_ctl_set_cpu_model_helper(uc_engine *handle, int model) { | |||
| uc_ctl(handle, UC_CTL_CPU_MODEL, model); | |||
There was a problem hiding this comment.
This is wrong, you have to use uc_ctl_set_cpu_model macro.
wtdcode
reviewed
Dec 2, 2021
bindings/go/unicorn/uc.h
Outdated
| @@ -1,2 +1,3 @@ | |||
| uc_err uc_reg_read_batch_helper(uc_engine *handle, int *regs, uint64_t *val_out, int count); | |||
| uc_err uc_reg_write_batch_helper(uc_engine *handle, int *regs, uint64_t *val_in, int count); | |||
| void uc_ctl_set_cpu_model_helper(uc_engine *handle, int model); | |||
There was a problem hiding this comment.
This is also wrong, the type of the return value is uc_err.
Go cannot use C macros directly, so I followed existing convention and added a helper to uc.c to call the uc_ctl_set_cpu_model macro
2dcc5ae to
2cc15c7
Compare
|
Merged, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I added a
SetCPUModelmethod to the unicorn interface in the go bindings to address #1502. CGO does not support calling C functions with varargs so I also added auc_ctl_set_cpu_model_helperfunction touc.cto calluc_ctlUsage:
emu, _ := uc.NewUnicorn(uc.ARCH_M68K, uc.MODE_BIG_ENDIAN) emu.SetCPUModel(uc.CPU_M68000_CPU)