Skip to content
Draft
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ SH:
- include/capstone/sh.h
- tests/details/sh.yaml

Etca:
- arch/Etca/**
- cstool/cstool_etca.c
- include/capstone/etca.h

Sparc:
- arch/Sparc/**
- cstool/cstool_sparc.c
Expand Down
24 changes: 21 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ if(APPLE AND NOT CAPSTONE_BUILD_MACOS_THIN)
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
endif()

set(SUPPORTED_ARCHITECTURES ARM AARCH64 M68K MIPS PPC SPARC SYSTEMZ XCORE X86 TMS320C64X M680X EVM MOS65XX WASM BPF RISCV SH TRICORE ALPHA HPPA LOONGARCH XTENSA ARC)
set(SUPPORTED_ARCHITECTURE_LABELS ARM AARCH64 M68K MIPS PowerPC Sparc SystemZ XCore x86 TMS320C64x M680x EVM MOS65XX WASM BPF RISCV SH TriCore Alpha HPPA LoongArch Xtensa ARC)
set(SUPPORTED_ARCHITECTURES ARM AARCH64 M68K MIPS PPC SPARC SYSTEMZ XCORE X86 TMS320C64X M680X EVM MOS65XX WASM BPF RISCV SH Etca TRICORE ALPHA HPPA LOONGARCH XTENSA ARC)
set(SUPPORTED_ARCHITECTURE_LABELS ARM AARCH64 M68K MIPS PowerPC Sparc SystemZ XCore x86 TMS320C64x M680x EVM MOS65XX WASM BPF RISCV SH Etca TriCore Alpha HPPA LoongArch Xtensa ARC)

# If building for OSX it's best to allow CMake to handle building both architectures
if(APPLE AND NOT CAPSTONE_BUILD_MACOS_THIN)
Expand Down Expand Up @@ -228,7 +228,7 @@ set(HEADERS_COMMON
include/capstone/sh.h
include/capstone/tricore.h
include/capstone/platform.h
include/capstone/sh.h
include/capstone/etca.h
include/capstone/alpha.h
include/capstone/hppa.h
include/capstone/loongarch.h
Expand Down Expand Up @@ -633,6 +633,20 @@ if(CAPSTONE_SH_SUPPORT)
)
endif()

if(CAPSTONE_Etca_SUPPORT)
add_definitions(-DCAPSTONE_HAS_ETCA)
set(SOURCES_ETCA
arch/Etca/EtcaDisassembler.c
arch/Etca/EtcaInstPrinter.c
arch/Etca/EtcaModule.c
)
set(HEADERS_ETCA
arch/Etca/EtcaDisassembler.h
arch/Etca/EtcaInstPrinter.h
arch/Etca/EtcaModule.h
)
endif()

if (CAPSTONE_TRICORE_SUPPORT)
add_definitions(-DCAPSTONE_HAS_TRICORE)
set(SOURCES_TRICORE
Expand Down Expand Up @@ -765,6 +779,7 @@ set(ALL_SOURCES
${SOURCES_BPF}
${SOURCES_RISCV}
${SOURCES_SH}
${SOURCES_ETCA}
${SOURCES_TRICORE}
${SOURCES_ALPHA}
${SOURCES_HPPA}
Expand Down Expand Up @@ -793,6 +808,7 @@ set(ALL_HEADERS
${HEADERS_BPF}
${HEADERS_RISCV}
${HEADERS_SH}
${HEADERS_ETCA}
${HEADERS_TRICORE}
${HEADERS_ALPHA}
${HEADERS_HPPA}
Expand Down Expand Up @@ -868,6 +884,7 @@ source_group("Source\\MOS65XX" FILES ${SOURCES_MOS65XX})
source_group("Source\\BPF" FILES ${SOURCES_BPF})
source_group("Source\\RISCV" FILES ${SOURCES_RISCV})
source_group("Source\\SH" FILES ${SOURCES_SH})
source_group("Source\\Etca" FILES ${SOURCES_ETCA})
source_group("Source\\TriCore" FILES ${SOURCES_TRICORE})
source_group("Source\\Alpha" FILES ${SOURCES_ALPHA})
source_group("Source\\HPPA" FILES ${SOURCES_HPPA})
Expand All @@ -894,6 +911,7 @@ source_group("Include\\MOS65XX" FILES ${HEADERS_MOS65XX})
source_group("Include\\BPF" FILES ${HEADERS_BPF})
source_group("Include\\RISCV" FILES ${HEADERS_RISCV})
source_group("Include\\SH" FILES ${HEADERS_SH})
source_group("Include\\Etca" FILES ${HEADERS_ETCA})
source_group("Include\\TriCore" FILES ${HEADERS_TRICORE})
source_group("Include\\Alpha" FILES ${HEADERS_ALPHA})
source_group("Include\\HPPA" FILES ${HEADERS_HPPA})
Expand Down
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,16 @@ ifneq (,$(findstring evm,$(CAPSTONE_ARCHS)))
LIBOBJ_EVM += $(LIBSRC_EVM:%.c=$(OBJDIR)/%.o)
endif

DEP_ETCA =
DEP_ETCA += $(wildcard arch/Etca/Etca*.inc)

LIBOBJ_ETCA =
ifneq (,$(findstring etca,$(CAPSTONE_ARCHS)))
CFLAGS += -DCAPSTONE_HAS_ETCA
LIBSRC_ETCA += $(wildcard arch/Etca/Etca*.c)
LIBOBJ_ETCA += $(LIBSRC_ETCA:%.c=$(OBJDIR)/%.o)
endif

DEP_RISCV =
DEP_RISCV += $(wildcard arch/RISCV/RISCV*.inc)

Expand Down
Loading
Loading