mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2025-10-06 03:50:02 +02:00
Merge remote-tracking branch 'origin/GP-2707_dev747368_string_translation_toggle_on_char_arrays' into Ghidra_10.2
This commit is contained in:
commit
3c566a4d5f
2 changed files with 6 additions and 5 deletions
|
@ -33,13 +33,13 @@ public class CharDataType extends AbstractIntegerDataType implements DataTypeWit
|
|||
CharDataType.class.getName());
|
||||
}
|
||||
|
||||
private static SettingsDefinition[] CHAR_SETTINGS_DEFS =
|
||||
{ FormatSettingsDefinition.DEF_CHAR, PADDING, ENDIAN, MNEMONIC,
|
||||
CharsetSettingsDefinition.CHARSET, RenderUnicodeSettingsDefinition.RENDER };
|
||||
private static SettingsDefinition[] CHAR_SETTINGS_DEFS = { FormatSettingsDefinition.DEF_CHAR,
|
||||
PADDING, ENDIAN, MNEMONIC, CharsetSettingsDefinition.CHARSET,
|
||||
RenderUnicodeSettingsDefinition.RENDER, TranslationSettingsDefinition.TRANSLATION };
|
||||
|
||||
private static SettingsDefinition[] WIDE_UTF_CHAR_SETTINGS_DEFS =
|
||||
{ FormatSettingsDefinition.DEF_CHAR, PADDING, ENDIAN, MNEMONIC,
|
||||
RenderUnicodeSettingsDefinition.RENDER };
|
||||
RenderUnicodeSettingsDefinition.RENDER, TranslationSettingsDefinition.TRANSLATION };
|
||||
|
||||
public static final CharDataType dataType = new CharDataType();
|
||||
|
||||
|
|
|
@ -24,7 +24,8 @@ import ghidra.util.StringUtilities;
|
|||
|
||||
public class WideCharDataType extends BuiltIn implements ArrayStringable, DataTypeWithCharset {
|
||||
final static SettingsDefinition[] DEFAULT_WIDE_CHAR_SETTINGS = new SettingsDefinition[] {
|
||||
EndianSettingsDefinition.DEF, RenderUnicodeSettingsDefinition.RENDER };
|
||||
EndianSettingsDefinition.DEF, RenderUnicodeSettingsDefinition.RENDER,
|
||||
TranslationSettingsDefinition.TRANSLATION };
|
||||
|
||||
/** A statically defined WideCharDataType instance. */
|
||||
public final static WideCharDataType dataType = new WideCharDataType();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue