Skip to content

Commit 6614ea5

Browse files
committed
GP-0 minor fixes for build
1 parent 7293efb commit 6614ea5

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Ghidra/Configurations/Public_Release/src/global/docs/ChangeHistory.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ <H1 align="center">Ghidra 10.1.5 Change History (July 2022)</H1>
1414
<li><I>Processors</I>. Added HC-12 processor support with a Flat 16-bit memory model by splitting HCS12X into HC-12, HCS-12, and HCS-12X processors. (GP-1716, Issue #1570, #4016)</li>
1515
<li><I>Processors</I>. Added ability to specify byte-mapped and overlay memory blocks from processor specification (*.pspec). (GP-2133, Issue #2703)</li>
1616
<li><I>Processors</I>. Added PowerPC e500 processor variant. (GP-2272)</li>
17+
<li><I>Processors</I>. Added support for AARCH64 ilp32 variant. (GP-2355)</li>
1718
</ul>
1819
</blockquote>
1920
<blockquote><p><u>Bugs</u></p>
@@ -37,7 +38,6 @@ <H1 align="center">Ghidra 10.1.5 Change History (July 2022)</H1>
3738
<li><I>Multi-User:Merge</I>. Corrected long-standing regression bug affecting datatype merge, which was introduced in Ghidra 9.2. This severe error could surface during a datatype conflict merge with a shared project and could prevent a check-in to a Ghidra Server repository. (GP-2066)</li>
3839
<li><I>Processors</I>. Refactored AVR8 to handle 24-bit memory and to correctly index the code address space as a byte or word. (GP-2213, Issue #4333)</li>
3940
<li><I>Processors</I>. ELF PLT import processing changed to avoid static disassembly for ARM/MIPS due to possibility of alternative instruction set. Now relies on disassembly during analysis for such cases. (GP-2256)</li>
40-
<li><I>Processors</I>. Added support for AARCH64 ilp32 variant. (GP-2355)</li>
4141
<li><I>Scripting</I>. Creating a new script via the Script Manager now properly handles the situation where the <B>$HOME/ghidra_scripts</B> directory does not exist. (GP-2282)</li>
4242
<li><I>Sleigh</I>. Fixed a Sleigh Parser threading issue that could cause incorrect p-code generation for languages that use delay slots. (GP-2235, Issue #4332)</li>
4343
</ul>

Ghidra/Processors/MIPS/data/languages/mips.sinc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -800,14 +800,16 @@ DXuPos: pos is lsb [ pos = lsb + 32; ] { tmp:1
800800
DinsXSize: mysize is msbd & lsb [ mysize = msbd - lsb + 1 + 32; ] { tmp:1 = mysize; export tmp; }
801801
@endif
802802

803-
@ifdef ISA_VARIANT
804803
macro JXWritePC(addr) {
804+
@ifdef ISA_VARIANT
805805
ISAModeSwitch = (addr & 0x1) != 0;
806806
tmp:$(REGSIZE) = -2;
807807
tmp = tmp & addr;
808808
pc = tmp;
809-
}
809+
@else
810+
pc=addr;
810811
@endif
812+
}
811813

812814
# Floating point formats
813815
#fmt: "S" is format=0x10 { }

0 commit comments

Comments
 (0)