mirror of
https://github.com/NationalSecurityAgency/ghidra
synced 2024-09-19 18:21:26 +00:00
Merge remote-tracking branch
'origin/GT-3616_ghidorahrex_PR-1671_mumbel_sleightokens' Fixes #1671 Fixes #1669
This commit is contained in:
commit
55aa4a766c
|
@ -212,7 +212,11 @@ fielddef
|
|||
} fieldmods) {
|
||||
if ($fielddef.size() > 0 && $fielddef::fieldQuality != null) {
|
||||
if ($tokendef.size() > 0 && $tokendef::tokenSymbol != null) {
|
||||
sc.addTokenField(find(n), $tokendef::tokenSymbol, $fielddef::fieldQuality);
|
||||
if ($tokendef::tokenSymbol.getToken().getSize()*8 <= $fielddef::fieldQuality.high) {
|
||||
reportError(find($t), "field high must be less than token size");
|
||||
} else {
|
||||
sc.addTokenField(find(n), $tokendef::tokenSymbol, $fielddef::fieldQuality);
|
||||
}
|
||||
} else if ($contextdef.size() > 0 && $contextdef::varnode != null) {
|
||||
if (!sc.addContextField($contextdef::varnode, $fielddef::fieldQuality)) {
|
||||
reportError(find($t), "all context definitions must come before constructors");
|
||||
|
|
Loading…
Reference in a new issue