Fix typo: unitialized -> uninitialized

This commit is contained in:
Matt Borgerson 2023-02-02 15:39:30 -07:00
parent 6eb78e7ef2
commit fbde367fe1
23 changed files with 55 additions and 55 deletions

View file

@ -332,7 +332,7 @@ public class DBTraceGuestPlatformMappedMemory implements Memory {
}
@Override
public MemoryBlock convertToInitialized(MemoryBlock unitializedBlock, byte initialValue)
public MemoryBlock convertToInitialized(MemoryBlock uninitializedBlock, byte initialValue)
throws LockException, MemoryBlockException, NotFoundException {
throw new UnsupportedOperationException();
}

View file

@ -257,7 +257,7 @@ public abstract class AbstractDBTraceProgramViewMemory
}
@Override
public MemoryBlock convertToInitialized(MemoryBlock unitializedBlock, byte initialValue)
public MemoryBlock convertToInitialized(MemoryBlock uninitializedBlock, byte initialValue)
throws LockException, MemoryBlockException, NotFoundException {
throw new UnsupportedOperationException();
}

View file

@ -247,7 +247,7 @@
<UL>
<LI><B>Initialized</B> - Specify a value and a new block will be created
using that value for every byte in the block. </LI>
<LI><B>Uninitialized</B> - An unitialized block will be created.</LI>
<LI><B>Uninitialized</B> - An uninitialized block will be created.</LI>
<LI><B>File Bytes</B> - Select from a list of imported files and enter
a starting offset for that file. Those bytes will be the initial value for the block.</LI>
<P><I><IMG src="help/shared/note.png" border="0"> You can use the "Add To Program"

View file

@ -263,7 +263,7 @@ public class DisassemblerPlugin extends Plugin {
cmd = new DisassembleCommand(addr, restrictedSet, true);
}
catch (MemoryAccessException e) {
tool.setStatusInfo("Can't disassemble unitialized memory!", true);
tool.setStatusInfo("Can't disassemble uninitialized memory!", true);
}
}
if (cmd != null) {
@ -333,7 +333,7 @@ public class DisassemblerPlugin extends Plugin {
cmd = new ArmDisassembleCommand(addr, null, thumbMode);
}
catch (MemoryAccessException e) {
tool.setStatusInfo("Can't disassemble unitialized memory!", true);
tool.setStatusInfo("Can't disassemble uninitialized memory!", true);
}
}
if (cmd != null) {
@ -357,7 +357,7 @@ public class DisassemblerPlugin extends Plugin {
cmd = new Hcs12DisassembleCommand(addr, null, xgMode);
}
catch (MemoryAccessException e) {
tool.setStatusInfo("Can't disassemble unitialized memory!", true);
tool.setStatusInfo("Can't disassemble uninitialized memory!", true);
}
}
if (cmd != null) {
@ -381,7 +381,7 @@ public class DisassemblerPlugin extends Plugin {
cmd = new MipsDisassembleCommand(addr, null, mips16);
}
catch (MemoryAccessException e) {
tool.setStatusInfo("Can't disassemble unitialized memory!", true);
tool.setStatusInfo("Can't disassemble uninitialized memory!", true);
}
}
if (cmd != null) {
@ -405,7 +405,7 @@ public class DisassemblerPlugin extends Plugin {
cmd = new PowerPCDisassembleCommand(addr, null, vle);
}
catch (MemoryAccessException e) {
tool.setStatusInfo("Can't disassemble unitialized memory!", true);
tool.setStatusInfo("Can't disassemble uninitialized memory!", true);
}
}
if (cmd != null) {

View file

@ -79,7 +79,7 @@ class AddBlockDialog extends DialogComponentProvider implements ChangeListener {
private final static String MAPPED = "Mapped";
private final static String UNMAPPED = "Unmapped";
private static final String UNITIALIZED = "UNITIALIZED";
private static final String UNINITIALIZED = "UNINITIALIZED";
private static final String INITIALIZED = "INITIALIZED";
private static final String FILE_BYTES = "FILE_BYTES";
private JPanel inializedTypePanel;
@ -246,7 +246,7 @@ class AddBlockDialog extends DialogComponentProvider implements ChangeListener {
initializedTypeCardLayout = new CardLayout();
inializedTypePanel = new JPanel(initializedTypeCardLayout);
inializedTypePanel.add(new JPanel(), UNITIALIZED);
inializedTypePanel.add(new JPanel(), UNINITIALIZED);
inializedTypePanel.add(buildInitalValuePanel(), INITIALIZED);
inializedTypePanel.add(buildFileBytesPanel(), FILE_BYTES);
return inializedTypePanel;
@ -312,7 +312,7 @@ class AddBlockDialog extends DialogComponentProvider implements ChangeListener {
commentField.setText("");
initialValueField.setValue(Long.valueOf(0));
model.setBlockType(MemoryBlockType.DEFAULT);
model.setInitializedType(AddBlockModel.InitializedType.UNITIALIZED);
model.setInitializedType(AddBlockModel.InitializedType.UNINITIALIZED);
model.setInitialValue(0);
readCB.setSelected(model.isRead());
@ -353,8 +353,8 @@ class AddBlockDialog extends DialogComponentProvider implements ChangeListener {
initializedTypeCardLayout.show(inializedTypePanel, INITIALIZED);
}
else if (uninitializedRB.isSelected()) {
model.setInitializedType(InitializedType.UNITIALIZED);
initializedTypeCardLayout.show(inializedTypePanel, UNITIALIZED);
model.setInitializedType(InitializedType.UNINITIALIZED);
initializedTypeCardLayout.show(inializedTypePanel, UNINITIALIZED);
}
else if (initializedFromFileBytesRB.isSelected()) {
model.setInitializedType(InitializedType.INITIALIZED_FROM_FILE_BYTES);

View file

@ -61,7 +61,7 @@ class AddBlockModel {
private long fileBytesOffset = -1;
enum InitializedType {
UNITIALIZED, INITIALIZED_FROM_VALUE, INITIALIZED_FROM_FILE_BYTES;
UNINITIALIZED, INITIALIZED_FROM_VALUE, INITIALIZED_FROM_FILE_BYTES;
}
AddBlockModel(PluginTool tool, Program program) {
@ -127,7 +127,7 @@ class AddBlockModel {
isOverlay = false;
schemeDestByteCount = blockType == MemoryBlockType.BIT_MAPPED ? 8 : 1;
schemeSrcByteCount = 1;
initializedType = InitializedType.UNITIALIZED;
initializedType = InitializedType.UNINITIALIZED;
validateInfo();
listener.stateChanged(null);
}
@ -275,7 +275,7 @@ class AddBlockModel {
case INITIALIZED_FROM_VALUE:
return new AddInitializedMemoryBlockCmd(blockName, comment, source, startAddr,
length, isRead, isWrite, isExecute, isVolatile, (byte) initialValue, isOverlay);
case UNITIALIZED:
case UNINITIALIZED:
return new AddUninitializedMemoryBlockCmd(blockName, comment, source, startAddr,
length, isRead, isWrite, isExecute, isVolatile, isOverlay);
default:

View file

@ -358,7 +358,7 @@ class MemoryMapModel extends AbstractSortedTableModel<MemoryBlock> {
initializeBlock(block);
}
else {
revertBlockToUnitialized(block);
revertBlockToUninitialized(block);
}
return;
@ -392,9 +392,9 @@ class MemoryMapModel extends AbstractSortedTableModel<MemoryBlock> {
}
}
private void revertBlockToUnitialized(MemoryBlock block) {
private void revertBlockToUninitialized(MemoryBlock block) {
int result = OptionDialog.showYesNoDialog(provider.getComponent(),
"Confirm Setting Block To Unitialized",
"Confirm Setting Block To Uninitialized",
"Are you sure you want to remove the bytes from this block? \n\n" +
"This will result in removing all functions, instructions, data,\n" +
"and outgoing references from the block!");

View file

@ -37,7 +37,7 @@ public class AoutHeaderMIPS extends AoutHeader {
gp_value = reader.readNextInt();
}
public int getUnitializedDataStart() {
public int getUninitializedDataStart() {
return bss_start;
}

View file

@ -236,7 +236,7 @@ public class AddBlockModelTest extends AbstractGhidraHeadedIntegrationTest
model.setStartAddress(getAddr(0x100));
model.setLength(100);
model.setBlockType(MemoryBlockType.BIT_MAPPED);
assertEquals(InitializedType.UNITIALIZED, model.getInitializedType());
assertEquals(InitializedType.UNINITIALIZED, model.getInitializedType());
model.setBaseAddress(getAddr(0x2000));
assertTrue(model.execute());
@ -251,7 +251,7 @@ public class AddBlockModelTest extends AbstractGhidraHeadedIntegrationTest
model.setStartAddress(getAddr(0x100));
model.setLength(100);
model.setBlockType(MemoryBlockType.BYTE_MAPPED);
assertEquals(InitializedType.UNITIALIZED, model.getInitializedType());
assertEquals(InitializedType.UNINITIALIZED, model.getInitializedType());
model.setBaseAddress(getAddr(0x2000));
assertTrue(model.execute());

View file

@ -478,7 +478,7 @@ public class MemoryMapProvider1Test extends AbstractGhidraHeadedIntegrationTest
@Test
public void testSortBlockType() throws Exception {
// add a bit overlay block, live block, and an unitialized block
// add a bit overlay block, live block, and an uninitialized block
tx(program, () -> {
memory.createBitMappedBlock(".Bit", getAddr(0), getAddr(0x01001000), 0x100, false);
memory.createUninitializedBlock(".Uninit", getAddr(0x3000), 0x200, false);
@ -504,7 +504,7 @@ public class MemoryMapProvider1Test extends AbstractGhidraHeadedIntegrationTest
@Test
public void testSortBlockTypeDescending() throws Exception {
// add a bit overlay block, live block, and an unitialized block
// add a bit overlay block, live block, and an uninitialized block
tx(program, () -> {
memory.createBitMappedBlock(".Bit", getAddr(0), getAddr(0x01001000), 0x100, false);
memory.createUninitializedBlock(".Uninit", getAddr(0x3000), 0x200, false);

View file

@ -94,7 +94,7 @@ public class MemoryBlockUtilTest extends AbstractGhidraHeadedIntegrationTest {
}
@Test
public void testGetByteOnUnitializedBlock() {
public void testGetByteOnUninitializedBlock() {
MemoryBlock block = MemoryBlockUtils.createUninitializedBlock(prog, false, "a",
space.getAddress(3000), 1000, "Acomment", "Asource", true, true, true, log);
try {

View file

@ -179,7 +179,7 @@ public class MyTestMemory extends AddressSet implements Memory {
}
@Override
public MemoryBlock convertToInitialized(MemoryBlock unitializedBlock, byte initialValue)
public MemoryBlock convertToInitialized(MemoryBlock uninitializedBlock, byte initialValue)
throws MemoryBlockException, NotFoundException {
throw new UnsupportedOperationException();
}

View file

@ -2871,7 +2871,7 @@ ProtoStoreSymbol::~ProtoStoreSymbol(void)
/// Retrieve the specified ProtoParameter object, making sure it is a ParameterSymbol.
/// If it doesn't exist, or if the object in the specific slot is not a ParameterSymbol,
/// allocate an (unitialized) parameter.
/// allocate an (uninitialized) parameter.
/// \param i is the specified input slot
/// \return the corresponding parameter
ParameterSymbol *ProtoStoreSymbol::getSymbolBacked(int4 i)

View file

@ -701,7 +701,7 @@ public class MemoryBlockDB implements MemoryBlock {
}
subBlocks.clear();
DBRecord subRecord = adapter.createSubBlockRecord(id, 0, length,
MemoryMapDBAdapter.SUB_TYPE_UNITIALIZED, 0, 0);
MemoryMapDBAdapter.SUB_TYPE_UNINITIALIZED, 0, 0);
subBlocks.add(new UninitializedSubMemoryBlock(adapter, subRecord));
}

View file

@ -1074,24 +1074,24 @@ public class MemoryMapDB implements Memory, ManagerDB, LiveMemoryListener {
}
@Override
public MemoryBlock convertToInitialized(MemoryBlock unitializedBlock, byte initialValue)
public MemoryBlock convertToInitialized(MemoryBlock uninitializedBlock, byte initialValue)
throws MemoryBlockException, NotFoundException, LockException {
lock.acquire();
try {
checkBlock(unitializedBlock);
checkBlock(uninitializedBlock);
program.checkExclusiveAccess();
if (unitializedBlock.isInitialized()) {
if (uninitializedBlock.isInitialized()) {
throw new IllegalArgumentException(
"Only an Uninitialized Block may be converted to an Initialized Block");
}
if (unitializedBlock.getType() != MemoryBlockType.DEFAULT) {
if (uninitializedBlock.getType() != MemoryBlockType.DEFAULT) {
throw new IllegalArgumentException("Block is of a type that cannot be initialized");
}
long size = unitializedBlock.getSize();
long size = uninitializedBlock.getSize();
if (size > MAX_BLOCK_SIZE) {
throw new MemoryBlockException("Block too large to initialize");
}
MemoryBlockDB memBlock = (MemoryBlockDB) unitializedBlock;
MemoryBlockDB memBlock = (MemoryBlockDB) uninitializedBlock;
try {
memBlock.initializeBlock(initialValue);
initializeBlocks();

View file

@ -72,7 +72,7 @@ abstract class MemoryMapDBAdapter {
static final byte SUB_TYPE_BIT_MAPPED = MemoryMapDBAdapterV3.V3_SUB_TYPE_BIT_MAPPED;
static final byte SUB_TYPE_BYTE_MAPPED = MemoryMapDBAdapterV3.V3_SUB_TYPE_BYTE_MAPPED;
static final byte SUB_TYPE_BUFFER = MemoryMapDBAdapterV3.V3_SUB_TYPE_BUFFER;
static final byte SUB_TYPE_UNITIALIZED = MemoryMapDBAdapterV3.V3_SUB_TYPE_UNITIALIZED;
static final byte SUB_TYPE_UNINITIALIZED = MemoryMapDBAdapterV3.V3_SUB_TYPE_UNINITIALIZED;
static final byte SUB_TYPE_FILE_BYTES = MemoryMapDBAdapterV3.V3_SUB_TYPE_FILE_BYTES;
static MemoryMapDBAdapter getAdapter(DBHandle handle, int openMode, MemoryMapDB memMap,

View file

@ -167,7 +167,7 @@ class MemoryMapDBAdapterV0 extends MemoryMapDBAdapter {
record.setIntValue(SUB_INT_DATA1_COL, bufID);
return new BufferSubMemoryBlock(this, record);
case UNINITIALIZED:
record.setByteValue(SUB_TYPE_COL, SUB_TYPE_UNITIALIZED);
record.setByteValue(SUB_TYPE_COL, SUB_TYPE_UNINITIALIZED);
return new UninitializedSubMemoryBlock(this, record);
default:
throw new IOException("Unknown memory block type: " + type);

View file

@ -136,7 +136,7 @@ class MemoryMapDBAdapterV2 extends MemoryMapDBAdapter {
record.setIntValue(SUB_INT_DATA1_COL, bufID);
return new BufferSubMemoryBlock(this, record);
case UNINITIALIZED:
record.setByteValue(SUB_TYPE_COL, SUB_TYPE_UNITIALIZED);
record.setByteValue(SUB_TYPE_COL, SUB_TYPE_UNINITIALIZED);
return new UninitializedSubMemoryBlock(this, record);
default:
throw new IOException("Unknown memory block type: " + type);

View file

@ -54,7 +54,7 @@ public class MemoryMapDBAdapterV3 extends MemoryMapDBAdapter {
static final byte V3_SUB_TYPE_BIT_MAPPED = 0;
static final byte V3_SUB_TYPE_BYTE_MAPPED = 1;
static final byte V3_SUB_TYPE_BUFFER = 2;
static final byte V3_SUB_TYPE_UNITIALIZED = 3;
static final byte V3_SUB_TYPE_UNINITIALIZED = 3;
static final byte V3_SUB_TYPE_FILE_BYTES = 4;
static Schema V3_BLOCK_SCHEMA = new Schema(V3_VERSION, "Key",
@ -215,7 +215,7 @@ public class MemoryMapDBAdapterV3 extends MemoryMapDBAdapter {
if (initializeBytes) {
return createInitializedBlock(name, startAddr, null, length, permissions);
}
return createUnitializedBlock(name, startAddr, length, permissions);
return createUninitializedBlock(name, startAddr, length, permissions);
}
@Override
@ -238,7 +238,7 @@ public class MemoryMapDBAdapterV3 extends MemoryMapDBAdapter {
return newBlock;
}
MemoryBlockDB createUnitializedBlock(String name, Address startAddress, long length,
MemoryBlockDB createUninitializedBlock(String name, Address startAddress, long length,
int permissions) throws IOException, AddressOverflowException {
updateAddressMapForAllAddresses(startAddress, length);
@ -246,7 +246,7 @@ public class MemoryMapDBAdapterV3 extends MemoryMapDBAdapter {
DBRecord blockRecord = createMemoryBlockRecord(name, startAddress, length, permissions);
long key = blockRecord.getKey();
DBRecord subRecord = createSubBlockRecord(key, 0, length, V3_SUB_TYPE_UNITIALIZED, 0, 0);
DBRecord subRecord = createSubBlockRecord(key, 0, length, V3_SUB_TYPE_UNINITIALIZED, 0, 0);
subBlocks.add(new UninitializedSubMemoryBlock(this, subRecord));
memBlockTable.putRecord(blockRecord);
@ -420,7 +420,7 @@ public class MemoryMapDBAdapterV3 extends MemoryMapDBAdapter {
return new ByteMappedSubMemoryBlock(this, record);
case V3_SUB_TYPE_BUFFER:
return new BufferSubMemoryBlock(this, record);
case V3_SUB_TYPE_UNITIALIZED:
case V3_SUB_TYPE_UNINITIALIZED:
return new UninitializedSubMemoryBlock(this, record);
case V3_SUB_TYPE_FILE_BYTES:
return new FileBytesSubMemoryBlock(this, record);

View file

@ -79,7 +79,7 @@ class UninitializedSubMemoryBlock extends SubMemoryBlock {
adapter.updateSubBlockRecord(record);
DBRecord newSubRecord = adapter.createSubBlockRecord(-1, 0, newLength,
MemoryMapDBAdapter.SUB_TYPE_UNITIALIZED, 0, 0);
MemoryMapDBAdapter.SUB_TYPE_UNINITIALIZED, 0, 0);
return new UninitializedSubMemoryBlock(adapter, newSubRecord);
}

View file

@ -392,14 +392,14 @@ public interface Memory extends AddressSetView {
/**
* Convert an existing uninitialized block with an
* initialized block.
* @param unitializedBlock unitialized block to convert
* @param uninitializedBlock uninitialized block to convert
* @param initialValue initial value for the bytes
* @throws LockException if exclusive lock not in place (see haveLock())
* @throws MemoryBlockException if there is no block in memory
* at the same address as block or if the block lengths are not
* the same.
*/
public MemoryBlock convertToInitialized(MemoryBlock unitializedBlock, byte initialValue)
public MemoryBlock convertToInitialized(MemoryBlock uninitializedBlock, byte initialValue)
throws LockException, MemoryBlockException, NotFoundException;
public MemoryBlock convertToUninitialized(MemoryBlock itializedBlock)

View file

@ -75,7 +75,7 @@ public class UniqueMemoryBankTest extends AbstractGenericTest {
}
@Test(expected = LowlevelError.class)
public void testGetUnitializedByte() {
public void testGetUninitializedByte() {
WordInfo info = new WordInfo();
info.setByte((byte) 0, 0);
info.setByte((byte) 1, 1);
@ -219,13 +219,13 @@ public class UniqueMemoryBankTest extends AbstractGenericTest {
}
@Test(expected = LowlevelError.class)
public void testUnitializedReadStop() {
public void testUninitializedReadStop() {
byte[] dest = new byte[16];
uniqueBank.getChunk(0x1000, 0x10, dest, false);
}
@Test
public void testUnitializedReadContinue() {
public void testUninitializedReadContinue() {
byte[] dest = new byte[16];
int bytesRead = uniqueBank.getChunk(0x1000, 0x10, dest, true);
assertEquals(0, bytesRead);

View file

@ -123,7 +123,7 @@ public class MemBlockDBTest extends AbstractGenericTest {
assertEquals(addr(9), info.getMaxAddress());
try {
block.getByte(addr(0));
fail("expected exception trying to read bytes on unitialized block");
fail("expected exception trying to read bytes on uninitialized block");
}
catch (MemoryAccessException e) {
// expected
@ -131,7 +131,7 @@ public class MemBlockDBTest extends AbstractGenericTest {
}
@Test
public void testCreateUnitializedOverlayBlock() throws Exception {
public void testCreateUninitializedOverlayBlock() throws Exception {
MemoryBlock block = mem.createUninitializedBlock("test", addr(0), 10, true);
assertEquals(10, block.getSize());
@ -148,7 +148,7 @@ public class MemBlockDBTest extends AbstractGenericTest {
assertEquals(10, info.getLength());
try {
block.getByte(block.getStart());
fail("expected exception trying to read bytes on unitialized block");
fail("expected exception trying to read bytes on uninitialized block");
}
catch (MemoryAccessException e) {
// expected
@ -206,7 +206,7 @@ public class MemBlockDBTest extends AbstractGenericTest {
}
try {
mem.getByte(block.getStart().add(10));
fail("expected exception trying to read bytes on mapped unitialized block");
fail("expected exception trying to read bytes on mapped uninitialized block");
}
catch (MemoryAccessException e) {
// expected
@ -243,7 +243,7 @@ public class MemBlockDBTest extends AbstractGenericTest {
}
try {
mem.getByte(block.getStart().add(8));
fail("expected exception trying to read bytes on mapped unitialized block");
fail("expected exception trying to read bytes on mapped uninitialized block");
}
catch (MemoryAccessException e) {
// expected
@ -533,7 +533,7 @@ public class MemBlockDBTest extends AbstractGenericTest {
}
@Test
public void testSplitAndJoinUnitializedBlock() throws Exception {
public void testSplitAndJoinUninitializedBlock() throws Exception {
MemoryBlock block = mem.createUninitializedBlock("test", addr(0), 40, false);
mem.split(block, addr(10));
MemoryBlock[] blocks = mem.getBlocks();
@ -977,7 +977,7 @@ public class MemBlockDBTest extends AbstractGenericTest {
}
@Test
public void testAddressSourceInfoForUnitialized() throws Exception {
public void testAddressSourceInfoForUninitialized() throws Exception {
mem.createUninitializedBlock("test", addr(0), 10, false);
AddressSourceInfo info = mem.getAddressSourceInfo(addr(0));