From 334eecbd16915754f3f89401473335a8bb53f335 Mon Sep 17 00:00:00 2001 From: "lmulert@emproof.de" Date: Fri, 28 Feb 2025 14:32:47 +0100 Subject: [PATCH 1/2] Fix tricore relocation 24REL handling --- .../format/elf/relocation/Tricore_ElfRelocationHandler.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Ghidra/Processors/tricore/src/main/java/ghidra/app/util/bin/format/elf/relocation/Tricore_ElfRelocationHandler.java b/Ghidra/Processors/tricore/src/main/java/ghidra/app/util/bin/format/elf/relocation/Tricore_ElfRelocationHandler.java index 0a69a4ca05..ed47f216a6 100644 --- a/Ghidra/Processors/tricore/src/main/java/ghidra/app/util/bin/format/elf/relocation/Tricore_ElfRelocationHandler.java +++ b/Ghidra/Processors/tricore/src/main/java/ghidra/app/util/bin/format/elf/relocation/Tricore_ElfRelocationHandler.java @@ -355,8 +355,7 @@ public class Tricore_ElfRelocationHandler */ private int relocate_relB(Memory memory, Address relocationAddress, long rv) throws MemoryAccessException { - // TODO ff000000..00fffffe? - long mask = 0xfffffffeL; + long mask = 0x00000001L; long val = ~mask & rv; int iw = memory.getInt(relocationAddress) & 0xff; iw |= ((val & 0x1fffe) << 15); From 4a8b802178458d3b1a23d88fba0bbe32288b8252 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Tue, 4 Mar 2025 13:03:10 -0500 Subject: [PATCH 2/2] GP-5449: Certify --- .../format/elf/relocation/Tricore_ElfRelocationHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ghidra/Processors/tricore/src/main/java/ghidra/app/util/bin/format/elf/relocation/Tricore_ElfRelocationHandler.java b/Ghidra/Processors/tricore/src/main/java/ghidra/app/util/bin/format/elf/relocation/Tricore_ElfRelocationHandler.java index ed47f216a6..59fde7b867 100644 --- a/Ghidra/Processors/tricore/src/main/java/ghidra/app/util/bin/format/elf/relocation/Tricore_ElfRelocationHandler.java +++ b/Ghidra/Processors/tricore/src/main/java/ghidra/app/util/bin/format/elf/relocation/Tricore_ElfRelocationHandler.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.