Merge remote-tracking branch 'origin/GT-2860_ryanmkurtz_PR-415_neutralinsomniac_remove-dup-code'

This commit is contained in:
Ryan Kurtz
2019-05-10 13:47:10 -04:00

View File

@@ -707,9 +707,6 @@ public class MipsAddressAnalyzer extends ConstantPropagationAnalyzer {
options.registerOption(OPTION_NAME_ASSUME_T9_ENTRY, OPTION_DEFAULT_ASSUME_T9_ENTRY, null,
OPTION_DESCRIPTION_ASSUME_T9_ENTRY);
options.registerOption(OPTION_NAME_ASSUME_T9_ENTRY, OPTION_DEFAULT_ASSUME_T9_ENTRY, null,
OPTION_DESCRIPTION_ASSUME_T9_ENTRY);
options.registerOption(OPTION_NAME_RECOVER_GP, OPTION_DEFAULT_RECOVER_GP, null,
OPTION_DESCRIPTION_RECOVER_GP);
@@ -721,9 +718,6 @@ public class MipsAddressAnalyzer extends ConstantPropagationAnalyzer {
assumeT9EntryAddress =
options.getBoolean(OPTION_NAME_ASSUME_T9_ENTRY, OPTION_DEFAULT_ASSUME_T9_ENTRY);
assumeT9EntryAddress =
options.getBoolean(OPTION_NAME_ASSUME_T9_ENTRY, OPTION_DEFAULT_ASSUME_T9_ENTRY);
discoverGlobalGPSetting =
options.getBoolean(OPTION_NAME_RECOVER_GP, OPTION_DEFAULT_RECOVER_GP);
}