mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-25 17:00:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-01-30 13:40:35 -05:00
parent 44510d1e84 64956a389b
commit 2bda2a49d5
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/stack/DebuggerStackPanel.java
View File

@@ -73,6 +73,9 @@ public class DebuggerStackPanel extends AbstractObjectsTableBasedPanel<TraceStac
@Override
public Address getValue() {
TraceObjectValue entry = row.getAttributeEntry(attributeName);
if (entry == null) {
return null;
}
return entry.getValue() instanceof Address addr ? addr : null;
}

27
Ghidra/Features/Decompiler/src/decompile/cpp/typeop.cc
View File

@@ -2254,7 +2254,13 @@ Datatype *TypeOpPtradd::getInputCast(const PcodeOp *op,int4 slot,const CastStrat
// not the (possibly different) type of the HIGH
Datatype *reqtype = op->getIn(0)->getTypeReadFacing(op);
Datatype *curtype = op->getIn(0)->getHighTypeReadFacing(op);
return castStrategy->castStandard(reqtype,curtype,false,false);
if (reqtype->getMetatype() != TYPE_PTR) return reqtype;
if (curtype->getMetatype() != TYPE_PTR) return reqtype;
Datatype *reqbase = ((TypePointer *)reqtype)->getPtrTo(); // Go down exactly one level
Datatype *curbase = ((TypePointer *)curtype)->getPtrTo();
if (reqbase->getAlignSize() == curbase->getAlignSize())
return (Datatype *)0;
return reqtype;
}
return TypeOp::getInputCast(op,slot,castStrategy);
}
@@ -2318,7 +2324,24 @@ Datatype *TypeOpPtrsub::getInputCast(const PcodeOp *op,int4 slot,const CastStrat
// not the (possibly different) type of the HIGH
Datatype *reqtype = op->getIn(0)->getTypeReadFacing(op);
Datatype *curtype = op->getIn(0)->getHighTypeReadFacing(op);
return castStrategy->castStandard(reqtype,curtype,false,false);
if (curtype == reqtype)
return (Datatype *)0;
if (reqtype->getMetatype() != TYPE_PTR) return reqtype;
if (curtype->getMetatype() != TYPE_PTR) return reqtype;
Datatype *reqbase = ((TypePointer *)reqtype)->getPtrTo(); // Go down exactly one level
Datatype *curbase = ((TypePointer *)curtype)->getPtrTo();
if (curbase->getMetatype() == TYPE_ARRAY && reqbase->getMetatype() == TYPE_ARRAY) {
curbase = ((TypeArray *)curbase)->getBase();
reqbase = ((TypeArray *)reqbase)->getBase();
}
while(reqbase->getTypedef() != (Datatype *)0)
reqbase = reqbase->getTypedef();
while(curbase->getTypedef() != (Datatype *)0)
curbase = curbase->getTypedef();
if (curbase == reqbase)
return (Datatype *)0;
return reqtype;
}
return TypeOp::getInputCast(op,slot,castStrategy);
}

2
Ghidra/Processors/AARCH64/data/languages/AARCH64neon.sinc
View File

@@ -16042,7 +16042,7 @@ is b_2431=0b01011110 & b_2223=0b00 & b_2121=0 & Rm_VPR128.4S & b_1015=0b000000 &
:sha1h Rd_FPR32, Rn_FPR32
is b_2431=0b01011110 & b_2223=0b00 & b_1721=0b10100 & b_1216=0b00000 & b_1011=0b10 & Rn_FPR32 & Rd_FPR32 & Zd
{
Rd_FPR32 = Rn_FPR32 << 30:1;
Rd_FPR32 = Rn_FPR32 << 30:1 | (Rn_FPR32 >> 2:1);
zext_zs(Zd); # zero upper 28 bytes of Zd
}