mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-25 23:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump capstone to 6.0.0-Alpha1.

Browse Source
This commit is contained in:
Bartosz Taudul 2024-10-04 17:19:18 +02:00
parent fd5ee53251
commit 5454b3202d
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/vendor.cmake
View File

@ -24,7 +24,7 @@ else()
CPMAddPackage(
NAME capstone
GITHUB_REPOSITORY capstone-engine/capstone
GIT_TAG 5.0.3
GIT_TAG 6.0.0-Alpha1
EXCLUDE_FROM_ALL TRUE
)
add_library(TracyCapstone INTERFACE)

16
profiler/src/profiler/TracySourceView.cpp
View File

@ -712,7 +712,7 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
rval = cs_open( CS_ARCH_ARM, CS_MODE_ARM, &handle );
break;
case CpuArchArm64:
rval = cs_open( CS_ARCH_ARM64, CS_MODE_ARM, &handle );
rval = cs_open( CS_ARCH_AARCH64, CS_MODE_ARM, &handle );
break;
default:
assert( false );
@ -777,9 +777,9 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
}
break;
case CpuArchArm64:
if( detail.arm64.op_count == 1 && detail.arm64.operands[0].type == ARM64_OP_IMM )
if( detail.aarch64.op_count == 1 && detail.aarch64.operands[0].type == AARCH64_OP_IMM )
{
jumpAddr = (uint64_t)detail.arm64.operands[0].imm;
jumpAddr = (uint64_t)detail.aarch64.operands[0].imm;
}
break;
default:
@ -864,18 +864,18 @@ bool SourceView::Disassemble( uint64_t symAddr, const Worker& worker )
}
break;
case CpuArchArm64:
for( uint8_t i=0; i<detail.arm64.op_count; i++ )
for( uint8_t i=0; i<detail.aarch64.op_count; i++ )
{
uint8_t type = 0;
switch( detail.arm64.operands[i].type )
switch( detail.aarch64.operands[i].type )
{
case ARM64_OP_IMM:
case AARCH64_OP_IMM:
type = 0;
break;
case ARM64_OP_REG:
case AARCH64_OP_REG:
type = 1;
break;
case ARM64_OP_MEM:
case AARCH64_OP_MEM:
type = 2;
break;
default:

6
server/TracyWorker.cpp
View File

@ -3846,7 +3846,7 @@ void Worker::AddSymbolCode( uint64_t ptr, const char* data, size_t sz )
rval = cs_open( CS_ARCH_ARM, CS_MODE_ARM, &handle );
break;
case CpuArchArm64:
rval = cs_open( CS_ARCH_ARM64, CS_MODE_ARM, &handle );
rval = cs_open( CS_ARCH_AARCH64, CS_MODE_ARM, &handle );
break;
default:
assert( false );
@ -3890,9 +3890,9 @@ void Worker::AddSymbolCode( uint64_t ptr, const char* data, size_t sz )
}
break;
case CpuArchArm64:
if( detail.arm64.op_count == 1 && detail.arm64.operands[0].type == ARM64_OP_IMM )
if( detail.aarch64.op_count == 1 && detail.aarch64.operands[0].type == AARCH64_OP_IMM )
{
callAddr = (uint64_t)detail.arm64.operands[0].imm;
callAddr = (uint64_t)detail.aarch64.operands[0].imm;
}
break;
default: