Remove all tab/space mismatches from the Core project. For anyone working on a branch that heavily involves the core, I am so sorry.

- Also killed off some trailing spaces/tabs.

- Updated the license header to be consistent with the rest of the project (All projects are now done moving over to this)

- Also, killed some dangling else's (where appropriate)

Now all the tab fixing is done. No more of this crap should be needed to be pushed. Rejoice!
This commit is contained in:
Lioncash
2013-04-16 23:14:36 -04:00
parent f498686289
commit 2316cb6876
324 changed files with 3133 additions and 2569 deletions

View File

@@ -28,14 +28,14 @@ namespace Gecko
enum
{
// Code Types
CODETYPE_WRITE_FILL = 0x0,
CODETYPE_IF = 0x1,
CODETYPE_BA_PO_OPS = 0x2,
CODETYPE_FLOW_CONTROL = 0x3,
CODETYPE_REGISTER_OPS = 0x4,
CODETYPE_SPECIAL_IF = 0x5,
CODETYPE_WRITE_FILL = 0x0,
CODETYPE_IF = 0x1,
CODETYPE_BA_PO_OPS = 0x2,
CODETYPE_FLOW_CONTROL = 0x3,
CODETYPE_REGISTER_OPS = 0x4,
CODETYPE_SPECIAL_IF = 0x5,
CODETYPE_ASM_SWITCH_RANGE = 0x6,
CODETYPE_END_CODES = 0x7,
CODETYPE_END_CODES = 0x7,
// Data Types
DATATYPE_8BIT = 0x0,
@@ -104,12 +104,14 @@ void SetActiveCodes(const std::vector<GeckoCode>& gcodes)
gcodes_iter = gcodes.begin(),
gcodes_end = gcodes.end();
for (; gcodes_iter!=gcodes_end; ++gcodes_iter)
{
if (gcodes_iter->enabled)
{
// TODO: apply modifiers
// TODO: don't need description or creator string, just takin up memory
active_codes.push_back(*gcodes_iter);
}
}
inserted_asm_codes.clear();
@@ -289,7 +291,8 @@ void RunCodeHandler()
}
}
const std::map<u32, std::vector<u32> >& GetInsertedAsmCodes() {
const std::map<u32, std::vector<u32> >& GetInsertedAsmCodes()
{
return inserted_asm_codes;
}
@@ -365,7 +368,7 @@ bool RamWriteAndFill()
const u8 data_type = current_code->address >> 28;
const u32 data_inc = current_code->data; // amount to increment the data
const u16 addr_inc = (u16)current_code->address; // amount to increment the address
count = ((current_code->address >> 16) & 0xFFF) + 1; // count is different from the other subtypes, note: +1
count = ((current_code->address >> 16) & 0xFFF) + 1; // count is different from the other subtypes, note: +1
while (count--)
{
// switch inside the loop, :/ o well
@@ -470,7 +473,7 @@ bool RegularIf()
// CST7 : 16bits (endif, then) If lower
case 0x3 :
result = (read_value < data_value);
break;
break;
}
}
@@ -591,7 +594,9 @@ bool FlowControl()
current_code = target_code - 1;
}
else
{
return false; // trying to GOTO to bad address
}
}
break;
@@ -608,7 +613,9 @@ bool FlowControl()
current_code = target_code - 1;
}
else
{
return false; // trying to GOSUB to bad address
}
}
break;