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

[AArch64/ARM64] Update to Capstone v6/auto-sync #3963

Closed
wants to merge 54 commits into from
Closed

[AArch64/ARM64] Update to Capstone v6/auto-sync #3963

wants to merge 54 commits into from

Conversation

Rot127
Copy link
Member

@Rot127 Rot127 commented Nov 6, 2023 •
edited by XVilka
Loading

Your checklist for this pull request

  • I've read the guidelines for contributing to this repository
  • I made sure to follow the project's coding style
  • I've documented or updated the documentation of every function and struct this PR changes. If not so I've explained why.
  • I've added tests that prove my fix is effective or that my feature works (if possible)
  • I've updated the rizin book with the relevant information (if needed)

Detailed description

Updates the AArch64/ARM64 module to Capstone's v6/auto-sync version.

Requires capstone-engine/capstone#2026 to be merged

Test plan

  • Test build with different CS ver. < 6
  • All green

Closing issues

...

@XVilka XVilka mentioned this pull request Nov 6, 2023
Closed
5 tasks
@XVilka
Copy link
Member

XVilka commented Nov 6, 2023

One more warning to fix upstream:

gcc -Isubprojects/capstone-auto-sync-aarch64/libcapstone.a.p -I../subprojects/capstone-auto-sync-aarch64/include -I../subprojects/capstone-auto-sync-aarch64/include/capstone -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Werror -O3 --std=gnu99 -Werror=sizeof-pointer-memaccess -fvisibility=hidden -DRZ_ASSERT_STDOUT=1 -Wno-cpp -fPIC -DCAPSTONE_X86_ATT_DISABLE_NO -DCAPSTONE_X86_REDUCE_NO -DCAPSTONE_USE_SYS_DYN_MEM -DCAPSTONE_DIET_NO -DCAPSTONE_HAS_ARM -DCAPSTONE_HAS_AARCH64 -DCAPSTONE_HAS_M68K -DCAPSTONE_HAS_M680X -DCAPSTONE_HAS_MIPS -DCAPSTONE_HAS_POWERPC -DCAPSTONE_HAS_SPARC -DCAPSTONE_HAS_SYSZ -DCAPSTONE_HAS_X86 -DCAPSTONE_HAS_XCORE -DCAPSTONE_HAS_TMS320C64X -DCAPSTONE_HAS_TRICORE -MD -MQ subprojects/capstone-auto-sync-aarch64/libcapstone.a.p/arch_AArch64_AArch64InstPrinter.c.o -MF subprojects/capstone-auto-sync-aarch64/libcapstone.a.p/arch_AArch64_AArch64InstPrinter.c.o.d -o subprojects/capstone-auto-sync-aarch64/libcapstone.a.p/arch_AArch64_AArch64InstPrinter.c.o -c ../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64InstPrinter.c
In file included from ../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64InstPrinter.c:39:
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64GenAsmWriter.inc: In function ‘AArch64InstPrinterValidateMCOperand’:
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:840:34: error: ‘Imm’ may be used uninitialized [-Werror=maybe-uninitialized]
  840 |                         if (Parts[i] != Parts[0]) \
      |                                  ^
In file included from ../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64InstPrinter.c:72:
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64GenAsmWriter.inc:33530:13: note: ‘Imm’ was declared here
33530 | static bool AArch64InstPrinterValidateMCOperand(const MCOperand *MCOp,
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64InstPrinter.c:39:
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:840:34: error: ‘Imm’ may be used uninitialized [-Werror=maybe-uninitialized]
  840 |                         if (Parts[i] != Parts[0]) \
      |                                  ^
In file included from ../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64InstPrinter.c:72:
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64GenAsmWriter.inc:33530:13: note: ‘Imm’ was declared here
33530 | static bool AArch64InstPrinterValidateMCOperand(const MCOperand *MCOp,
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64InstPrinter.c:39:
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:840:34: error: ‘Imm’ may be used uninitialized [-Werror=maybe-uninitialized]
  840 |                         if (Parts[i] != Parts[0]) \
      |                                  ^
In file included from ../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64InstPrinter.c:72:
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64GenAsmWriter.inc:33530:13: note: ‘Imm’ was declared here
33530 | static bool AArch64InstPrinterValidateMCOperand(const MCOperand *MCOp,
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64InstPrinter.c:39:
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:840:34: error: ‘Imm’ may be used uninitialized [-Werror=maybe-uninitialized]
  840 |                         if (Parts[i] != Parts[0]) \
      |                                  ^
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:892:1: note: ‘Imm’ was declared here
  892 | AArch64_AM_isSVEMoveMaskPreferredLogicalImmediate(int64_t Imm)
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:840:34: error: ‘Imm’ may be used uninitialized [-Werror=maybe-uninitialized]
  840 |                         if (Parts[i] != Parts[0]) \
      |                                  ^
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:892:1: note: ‘Imm’ was declared here
  892 | AArch64_AM_isSVEMoveMaskPreferredLogicalImmediate(int64_t Imm)
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:840:34: error: ‘Imm’ may be used uninitialized [-Werror=maybe-uninitialized]
  840 |                         if (Parts[i] != Parts[0]) \
      |                                  ^
In file included from ../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64InstPrinter.c:72:
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64GenAsmWriter.inc:33530:13: note: ‘Imm’ was declared here
33530 | static bool AArch64InstPrinterValidateMCOperand(const MCOperand *MCOp,
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64InstPrinter.c:39:
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:840:34: error: ‘Imm’ may be used uninitialized [-Werror=maybe-uninitialized]
  840 |                         if (Parts[i] != Parts[0]) \
      |                                  ^
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:892:1: note: ‘Imm’ was declared here
  892 | AArch64_AM_isSVEMoveMaskPreferredLogicalImmediate(int64_t Imm)
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:840:34: error: ‘Imm’ may be used uninitialized [-Werror=maybe-uninitialized]
  840 |                         if (Parts[i] != Parts[0]) \
      |                                  ^
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:892:1: note: ‘Imm’ was declared here
  892 | AArch64_AM_isSVEMoveMaskPreferredLogicalImmediate(int64_t Imm)
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:840:34: error: ‘Imm’ may be used uninitialized [-Werror=maybe-uninitialized]
  840 |                         if (Parts[i] != Parts[0]) \
      |                                  ^
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:892:1: note: ‘Imm’ was declared here
  892 | AArch64_AM_isSVEMoveMaskPreferredLogicalImmediate(int64_t Imm)
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:840:34: error: ‘Imm’ may be used uninitialized [-Werror=maybe-uninitialized]
  840 |                         if (Parts[i] != Parts[0]) \
      |                                  ^
../subprojects/capstone-auto-sync-aarch64/arch/AArch64/AArch64AddressingModes.h:892:1: note: ‘Imm’ was declared here
  892 | AArch64_AM_isSVEMoveMaskPreferredLogicalImmediate(int64_t Imm)
      | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
[7/2061] Compiling C object subprojects/capstone-auto-sync-aarch64/libcapstone.a.p/arch_AArch64_AArch64Disassembler.c.o
[8/2061] Compiling C object subprojects/capstone-auto-sync-aarch64/libcapstone.a.p/arch_ARM_ARMDisassembler.c.o
ninja: build stopped: subcommand failed.

@Rot127
Copy link
Member Author

Rot127 commented Nov 7, 2023

Weird. I disabled the warning. It is not correct. Will look into it later this week.

@Rot127 Rot127 force-pushed the dist-capstone-v6-aarch64 branch from 2c3ed26 to 9336e09 Compare November 16, 2023 15:59
Rot127 added 21 commits November 27, 2023 13:49
@Rot127
[AArch64 CS v6 BEGIN] Change subproject config to use cs-auto-sync-aa…
da8ab70 
…rch64 branch
@Rot127
Replace ARM64 with version sensitive macros.
d0c6569
@Rot127
Exclude alias if CS version >= 6
c822f15
@Rot127
Update access to writeback member
434c22e
@Rot127
Exclude instr alias from inclusion
db63fb9
@Rot127
Update memory operand printing to json.
0383120
@Rot127
Enable real instr. detail only for AArch64
c04f3a2
@Rot127
Set correct arch name in meson.build for CS
9c3ecc6
@Rot127
Fix U/SBFM instructions and their alias.
28cd385
@Rot127
Mark parameters with RZ_OUt/BORROW
9f25f83
@Rot127
Optimize register extension to skip some, if the width already matches.
d53ad83
@Rot127
Adapt width and lsb of U/SBFM alias instructions (ImmR and ImmS are f…
e639f1b 
…rom U/SBFM).
@Rot127
Fix tests correct semantic buy bad syntax
6a7888a
@Rot127
Pass alias MOV instructions to mov()
144fb48
@Rot127
Handle CSET and CSETM alias
c14f1a8
@Rot127
Fix lsl, lsr and asr by handling them as alias.
af32784
@Rot127
Fix mov alias.
d9a8b4b
@Rot127
Handle TST alias
521bb08
@Rot127
Fix CNEG, CINV alias
e3631f2
@Rot127
Fix bfi and bfxil alias.
cef14b1
@Rot127
Fix sign extensions.
9d00c68
Rot127 added 20 commits November 27, 2023 13:50
@Rot127
Add missing writeback checks for Post and preindex
ed232f1
@Rot127
Handle UBFM and SBFM alias
3c4c91a
@Rot127
Handl BFM alias
a853a50
@Rot127
Handle CMP, CSET and CINC alias
11f8ede
@Rot127
Update meson file of for cs-aarch64 branch
6156869
@Rot127
Fix asm tests. Use reg alias now.
c242cb6
@Rot127
Fix condition confusion and incorrect operand usage.
c6c78cd
@Rot127
Fix plf test.
2bd5207
@Rot127
Run clang-format
1035edd
@Rot127
Use register alias in tests
daa9d11
@Rot127
Add support for fp and lr reg alias assembly.
761d845
@Rot127
Use reg alias in test
07783a8
@Rot127
Rename cond tranlate functions r2 -> rz
d1e6ffa
@Rot127
Fix condition check which assume 0 == invalid.
4258742
@Rot127
Fix issues intruduced by rebase
18a48e1
@Rot127
Set CS commit to current next branch.
94a15ef
@Rot127
Rename ARM64 -> AArch64
d109f5c
@Rot127
Add missing source file to meson.build
beffb6e
@Rot127
Remove DisassemblerExtension.c file for CS v5
51e31fb
@Rot127
Update to newest capstone next branch
dda2ce5
@Rot127 Rot127 force-pushed the dist-capstone-v6-aarch64 branch from 618a35e to dda2ce5 Compare November 27, 2023 18:51
@Rot127 Rot127 force-pushed the dist-capstone-v6-aarch64 branch from 1685cbb to 2070f2b Compare November 30, 2023 15:00
@Rot127 Rot127 force-pushed the dist-capstone-v6-aarch64 branch from 3efcc6e to a49b747 Compare November 30, 2023 15:29
@Rot127 Rot127 force-pushed the dist-capstone-v6-aarch64 branch from a49b747 to 411670f Compare November 30, 2023 16:05
@Rot127
Copy link
Member Author

Rot127 commented Nov 30, 2023

Superseded by #4011

@Rot127 Rot127 closed this Nov 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wargio wargio Awaiting requested review from wargio wargio will be requested when the pull request is marked ready for review wargio is a code owner

@XVilka XVilka Awaiting requested review from XVilka XVilka will be requested when the pull request is marked ready for review XVilka is a code owner

@kazarmy kazarmy Awaiting requested review from kazarmy kazarmy will be requested when the pull request is marked ready for review kazarmy is a code owner

@thestr4ng3r thestr4ng3r Awaiting requested review from thestr4ng3r thestr4ng3r will be requested when the pull request is marked ready for review thestr4ng3r is a code owner

@ret2libc ret2libc Awaiting requested review from ret2libc ret2libc will be requested when the pull request is marked ready for review ret2libc is a code owner

Assignees
No one assigned
Labels
ARM rz-test RzAnalysis RzAsm-Assembler RzCore
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Rot127 @XVilka