From 8f49837efec2c96ae475484297a3eb268d5eeea2 Mon Sep 17 00:00:00 2001
From: James <49045138+ghidracadabra@users.noreply.github.com>
Date: Wed, 27 Jan 2021 18:03:21 +0000
Subject: [PATCH] additional changes due to github #2693
---
.../java/ghidra/pcodeCPort/slgh_compile/PcodeParser.java | 2 +-
.../ghidra/program/model/lang/PcodeInjectLibrary.java | 3 ++-
.../resources/ghidra/pcodeCPort/slgh_compile/pcode1.xml | 8 ++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/PcodeParser.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/PcodeParser.java
index e9edc403bf..416aed5e31 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/PcodeParser.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/pcodeCPort/slgh_compile/PcodeParser.java
@@ -133,7 +133,7 @@ public class PcodeParser extends PcodeCompile {
@Override
public long allocateTemp() {
long base = tempbase;
- tempbase = base + 16; // Should be maximum size of a unique
+ tempbase = base + SleighBase.MAX_UNIQUE_SIZE;
return base;
}
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/PcodeInjectLibrary.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/PcodeInjectLibrary.java
index 87a976621f..d7b6429b10 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/PcodeInjectLibrary.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/PcodeInjectLibrary.java
@@ -24,6 +24,7 @@ import org.xml.sax.*;
import ghidra.app.plugin.processors.sleigh.SleighException;
import ghidra.app.plugin.processors.sleigh.SleighLanguage;
import ghidra.app.plugin.processors.sleigh.template.*;
+import ghidra.pcodeCPort.sleighbase.SleighBase;
import ghidra.pcodeCPort.slgh_compile.PcodeParser;
import ghidra.program.model.lang.InjectPayload.InjectParameter;
import ghidra.program.model.listing.Program;
@@ -160,7 +161,7 @@ public class PcodeInjectLibrary {
ConstTpl c = v.getOffset();
long offset = c.getReal();
if (offset >= uniqueBase) {
- uniqueBase = offset + 16;
+ uniqueBase = offset + SleighBase.MAX_UNIQUE_SIZE;
}
}
diff --git a/Ghidra/Test/IntegrationTest/src/test.slow/resources/ghidra/pcodeCPort/slgh_compile/pcode1.xml b/Ghidra/Test/IntegrationTest/src/test.slow/resources/ghidra/pcodeCPort/slgh_compile/pcode1.xml
index 3d776d944a..147f74fb6d 100644
--- a/Ghidra/Test/IntegrationTest/src/test.slow/resources/ghidra/pcodeCPort/slgh_compile/pcode1.xml
+++ b/Ghidra/Test/IntegrationTest/src/test.slow/resources/ghidra/pcodeCPort/slgh_compile/pcode1.xml
@@ -2,24 +2,24 @@
-
+
-
+
-
+
-
+