From 5d9f0a18625e2517401a60bde464328d6b1db8d5 Mon Sep 17 00:00:00 2001 From: "auto-updater[bot]" <95504767+auto-updater[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 14:27:27 +0000 Subject: [PATCH] Update Ghidra HEAD to commit eaf6f0e64 (#219) * Bump Ghidra HEAD commit eaf6f0e64 * Add new files to CMake ``` M Ghidra/Features/Decompiler/src/decompile/cpp/Makefile M Ghidra/Features/Decompiler/src/decompile/cpp/fspec.cc M Ghidra/Features/Decompiler/src/decompile/cpp/fspec.hh M Ghidra/Features/Decompiler/src/decompile/cpp/grammar.cc M Ghidra/Features/Decompiler/src/decompile/cpp/grammar.y M Ghidra/Features/Decompiler/src/decompile/cpp/marshal.cc M Ghidra/Features/Decompiler/src/decompile/cpp/marshal.hh A Ghidra/Features/Decompiler/src/decompile/cpp/modelrules.cc A Ghidra/Features/Decompiler/src/decompile/cpp/modelrules.hh M Ghidra/Features/Decompiler/src/decompile/cpp/space.cc M Ghidra/Features/Decompiler/src/decompile/cpp/translate.cc M Ghidra/Features/Decompiler/src/decompile/cpp/translate.hh M Ghidra/Features/Decompiler/src/decompile/cpp/type.cc M Ghidra/Features/Decompiler/src/decompile/cpp/type.hh A Ghidra/Features/Decompiler/src/decompile/datatests/retspecial.xml M Ghidra/Features/Decompiler/src/decompile/unittests/testfuncproto.cc A Ghidra/Features/Decompiler/src/decompile/unittests/testparamstore.cc M Ghidra/Processors/AARCH64/data/languages/AARCH64.cspec A Ghidra/Processors/Loongarch/Module.manifest A Ghidra/Processors/Loongarch/build.gradle A Ghidra/Processors/Loongarch/certification.manifest A Ghidra/Processors/Loongarch/data/languages/ilp32d.cspec A Ghidra/Processors/Loongarch/data/languages/ilp32f.cspec A Ghidra/Processors/Loongarch/data/languages/lasx.sinc A Ghidra/Processors/Loongarch/data/languages/lbt.sinc A Ghidra/Processors/Loongarch/data/languages/loongarch.ldefs A Ghidra/Processors/Loongarch/data/languages/loongarch.opinion A Ghidra/Processors/Loongarch/data/languages/loongarch32.pspec A Ghidra/Processors/Loongarch/data/languages/loongarch32_f32.slaspec A Ghidra/Processors/Loongarch/data/languages/loongarch32_f64.slaspec A Ghidra/Processors/Loongarch/data/languages/loongarch32_instructions.sinc A Ghidra/Processors/Loongarch/data/languages/loongarch64.pspec A Ghidra/Processors/Loongarch/data/languages/loongarch64_f32.slaspec A Ghidra/Processors/Loongarch/data/languages/loongarch64_f64.slaspec A Ghidra/Processors/Loongarch/data/languages/loongarch64_instructions.sinc A Ghidra/Processors/Loongarch/data/languages/loongarch_double.sinc A Ghidra/Processors/Loongarch/data/languages/loongarch_float.sinc A Ghidra/Processors/Loongarch/data/languages/loongarch_main.sinc A Ghidra/Processors/Loongarch/data/languages/lp64d.cspec A Ghidra/Processors/Loongarch/data/languages/lp64f.cspec A Ghidra/Processors/Loongarch/data/languages/lsx.sinc A Ghidra/Processors/Loongarch/data/languages/lvz.sinc A Ghidra/Processors/Loongarch/data/manuals/loongarch.idx A Ghidra/Processors/Loongarch/data/patterns/loongarch_patterns.xml A Ghidra/Processors/Loongarch/data/patterns/patternconstraints.xml A Ghidra/Processors/Loongarch/src/main/java/ghidra/app/plugin/core/analysis/LoongsonAnalyzer.java A Ghidra/Processors/Loongarch/src/test.processors/java/ghidra/test/processors/Loongarch64_O0_EmulatorTest.java A Ghidra/Processors/Loongarch/src/test.processors/java/ghidra/test/processors/Loongarch64_O3_EmulatorTest.java A Ghidra/Processors/Loongarch/src/test.processors/java/ghidra/test/processors/Loongarch64f_O0_EmulatorTest.java A Ghidra/Processors/Loongarch/src/test.processors/java/ghidra/test/processors/Loongarch64f_O3_EmulatorTest.java M Ghidra/Processors/MIPS/src/main/java/ghidra/app/util/bin/format/elf/relocation/MIPS_ElfRelocationHandler.java ``` --------- Co-authored-by: Eric Kilmer --- CMakeLists.txt | 9 +++++---- src/setup-ghidra-source.cmake | 11 ++++++----- src/spec_files_HEAD.cmake | 4 ++++ tests/CMakeLists.txt | 9 +++++---- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2581b8e5f..3e0bed659 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,10 +136,11 @@ set(public_include_header_list "${library_root}/unionresolve.hh" "${library_root}/marshal.hh" ) -#if(sleigh_RELEASE_IS_HEAD) -# list(APPEND public_include_header_list -# ) -#endif() +if(sleigh_RELEASE_IS_HEAD) + list(APPEND public_include_header_list + "${library_root}/modelrules.hh" + ) +endif() # Create custom target so that IDEs know these files are part of the sources add_custom_target(sleigh_all_headers SOURCES ${public_include_header_list}) set(public_headers_dir ${CMAKE_CURRENT_BINARY_DIR}/include) diff --git a/src/setup-ghidra-source.cmake b/src/setup-ghidra-source.cmake index 90fb52315..db17e4e1f 100644 --- a/src/setup-ghidra-source.cmake +++ b/src/setup-ghidra-source.cmake @@ -48,7 +48,7 @@ if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD") # TODO: CMake only likes numeric characters in the version string.... set(ghidra_head_version "10.5") set(ghidra_version "${ghidra_head_version}") - set(ghidra_head_git_tag "ddf36db434ebf86efe241afc9b344caa304a2b24") + set(ghidra_head_git_tag "eaf6f0e6461642ff8bde6c7606559fcf416d83f4") set(ghidra_git_tag "${ghidra_head_git_tag}") set(ghidra_shallow FALSE) set(ghidra_patches @@ -163,10 +163,11 @@ set(sleigh_deccore_source_list "${library_root}/paramid.cc" "${library_root}/unionresolve.cc" ) -#if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD") -# list(APPEND sleigh_deccore_source_list -# ) -#endif() +if("${sleigh_RELEASE_TYPE}" STREQUAL "HEAD") + list(APPEND sleigh_deccore_source_list + "${library_root}/modelrules.cc" + ) +endif() set(sleigh_extra_source_list "${library_root}/callgraph.cc" diff --git a/src/spec_files_HEAD.cmake b/src/spec_files_HEAD.cmake index 282e9d425..8624bf0e7 100644 --- a/src/spec_files_HEAD.cmake +++ b/src/spec_files_HEAD.cmake @@ -57,6 +57,10 @@ set(spec_file_list "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/HCS12/data/languages/HCS12.slaspec" "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/HCS12/data/languages/HCS12X.slaspec" "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/JVM/data/languages/JVM.slaspec" + "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch32_f32.slaspec" + "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch32_f64.slaspec" + "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch64_f32.slaspec" + "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/Loongarch/data/languages/loongarch64_f64.slaspec" "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/M8C/data/languages/m8c.slaspec" "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/MC6800/data/languages/6805.slaspec" "${ghidrasource_SOURCE_DIR}/Ghidra/Processors/MC6800/data/languages/6809.slaspec" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ba269997e..05f8e03ae 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -25,10 +25,11 @@ add_executable(sleigh_ghidra_test "${library_root}/../unittests/testmarshal.cc" ) -# if(sleigh_RELEASE_IS_HEAD) -# target_sources(sleigh_ghidra_test PRIVATE -# ) -# endif() +if(sleigh_RELEASE_IS_HEAD) + target_sources(sleigh_ghidra_test PRIVATE + "${library_root}/../unittests/testparamstore.cc" + ) +endif() target_compile_features(sleigh_ghidra_test PRIVATE cxx_std_11) target_include_directories(sleigh_ghidra_test PRIVATE "${library_root}")