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

Merge remote-tracking branch

Browse Source 
'origin/GP-4823_ghizard_Demangler_add_char8_t' (#6744)
This commit is contained in:
Ryan Kurtz
2024-08-08 11:30:19 -04:00
parent 293cca1fa9 5878f4fd4c
commit 87e259e6aa
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/Features/Base/src/main/java/ghidra/app/util/demangler/DemangledDataType.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -67,6 +67,7 @@ public class DemangledDataType extends DemangledType {
public final static String WCHAR_T = "wchar_t"; public final static String WCHAR_T = "wchar_t";
public final static String WCHAR16 = "char16_t"; public final static String WCHAR16 = "char16_t";
public final static String WCHAR32 = "char32_t"; public final static String WCHAR32 = "char32_t";
public final static String CHAR8_T = "char8_t";
public final static String SHORT = "short"; public final static String SHORT = "short";
public final static String INT = "int"; public final static String INT = "int";
public final static String INT0_T = "int0_t"; public final static String INT0_T = "int0_t";
@@ -94,7 +95,7 @@ public class DemangledDataType extends DemangledType {
private static final String UNSIGNED_LONG = "unsigned long"; private static final String UNSIGNED_LONG = "unsigned long";
public final static String[] PRIMITIVES = public final static String[] PRIMITIVES =
{ VOID, BOOL, CHAR, WCHAR_T, WCHAR16, WCHAR32, SHORT, INT, INT0_T, LONG, { VOID, BOOL, CHAR, WCHAR_T, WCHAR16, WCHAR32, CHAR8_T, SHORT, INT, INT0_T, LONG,
LONG_LONG, FLOAT, FLOAT2, DOUBLE, INT128, FLOAT128, LONG_DOUBLE, }; LONG_LONG, FLOAT, FLOAT2, DOUBLE, INT128, FLOAT128, LONG_DOUBLE, };
private int arrayDimensions = 0; private int arrayDimensions = 0;
@@ -256,6 +257,9 @@ public class DemangledDataType extends DemangledType {
else if (WCHAR32.equals(name)) { else if (WCHAR32.equals(name)) {
dt = WideChar32DataType.dataType; dt = WideChar32DataType.dataType;
} }
else if (CHAR8_T.equals(name)) {
dt = UnsignedCharDataType.dataType;
}
else if (SHORT.equals(name)) { else if (SHORT.equals(name)) {
if (isUnsigned()) { if (isUnsigned()) {
dt = UnsignedShortDataType.dataType; dt = UnsignedShortDataType.dataType;