Skip to content

Remove improperly named LOCAL_U24 instructions and replace with STATIC_U24 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yubie-re wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove improperly named LOCAL_U24 instructions and replace with STATIC_U24 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ GTA V Script Decompiler/Release/
GTA V Script Decompiler/bin/
*.exe
*.db
!GTA V Script Decompiler/Resources/functions.db
!GTA V Script Decompiler/Resources/functions.db
/.vscode/
9 changes: 3 additions & 6 deletions GTA V Script Decompiler/Disassembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ public static string[][] OpcodeArgs
new[]{"ILT_JZ", "R"},
new[]{"ILE_JZ", "R"},
new[]{"CALL", "a"},
new[]{"LOCAL_U24", "a"},
new[]{"LOCAL_U24_LOAD", "a"},
new[]{"LOCAL_U24_STORE", "a"},
new[]{"STATIC_U24", "a"},
new[]{"STATIC_U24_LOAD", "a"},
new[]{"STATIC_U24_STORE", "a"},
new[]{"GLOBAL_U24", "a"},
new[]{"GLOBAL_U24_LOAD", "a"},
new[]{"GLOBAL_U24_STORE", "a"},
Expand Down Expand Up @@ -155,9 +155,6 @@ public static string[][] OpcodeArgs
new[]{"GLOBAL_LOAD_S", ""},
new[]{"GLOBAL_STORE_S", ""},
new[]{"GLOBAL_STORE_SR", ""},
new[]{"STATIC_U24", ""},
new[]{"STATIC_U24_LOAD", ""},
new[]{"STATIC_U24_STORE", ""}
};
private readonly Function Function;
private readonly Patch[] patches;
Expand Down
6 changes: 0 additions & 6 deletions GTA V Script Decompiler/Function.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,9 +627,6 @@ public void BuildInstructions()
case Opcode.STATIC_U24:
case Opcode.STATIC_U24_LOAD:
case Opcode.STATIC_U24_STORE:
case Opcode.LOCAL_U24:
case Opcode.LOCAL_U24_LOAD:
case Opcode.LOCAL_U24_STORE:
case Opcode.GLOBAL_U24:
case Opcode.GLOBAL_U24_LOAD:
case Opcode.GLOBAL_U24_STORE:
Expand Down Expand Up @@ -907,17 +904,14 @@ internal void DecodeStatementTree(Ast.StatementTree.Tree tree)
break;
case Opcode.LOCAL_U8:
case Opcode.LOCAL_U16:
case Opcode.LOCAL_U24:
Stack.Push(new Ast.Local(this, Instructions[tree.Offset].GetOperandsAsUInt));
break;
case Opcode.LOCAL_U8_LOAD:
case Opcode.LOCAL_U16_LOAD:
case Opcode.LOCAL_U24_LOAD:
Stack.Push(new Ast.LocalLoad(this, Instructions[tree.Offset].GetOperandsAsUInt));
break;
case Opcode.LOCAL_U8_STORE:
case Opcode.LOCAL_U16_STORE:
case Opcode.LOCAL_U24_STORE:
tree.Statements.Add(new Ast.LocalStore(this, Instructions[tree.Offset].GetOperandsAsUInt, Stack.Pop()));
break;
case Opcode.STATIC_U8:
Expand Down
9 changes: 3 additions & 6 deletions GTA V Script Decompiler/Instruction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ internal enum Opcode //opcodes reversed from gta v eboot.bin
ILT_JZ,
ILE_JZ,
CALL,
LOCAL_U24,
LOCAL_U24_LOAD,
LOCAL_U24_STORE,
STATIC_U24,
STATIC_U24_LOAD,
STATIC_U24_STORE,
GLOBAL_U24,
GLOBAL_U24_LOAD,
GLOBAL_U24_STORE,
Expand Down Expand Up @@ -153,9 +153,6 @@ internal enum Opcode //opcodes reversed from gta v eboot.bin
GLOBAL_LOAD_S,
GLOBAL_STORE_S,
GLOBAL_STORE_SR,
STATIC_U24,
STATIC_U24_LOAD,
STATIC_U24_STORE,
};

internal class Instruction
Expand Down
6 changes: 0 additions & 6 deletions GTA V Script Decompiler/ScriptFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,9 +251,6 @@ private void AddFunction(int start1, int start2)
case Opcode.STATIC_U24:
case Opcode.STATIC_U24_LOAD:
case Opcode.STATIC_U24_STORE:
case Opcode.LOCAL_U24:
case Opcode.LOCAL_U24_LOAD:
case Opcode.LOCAL_U24_STORE:
case Opcode.GLOBAL_U24:
case Opcode.GLOBAL_U24_LOAD:
case Opcode.GLOBAL_U24_STORE:
Expand Down Expand Up @@ -353,9 +350,6 @@ private void GetFunctions()
case Opcode.STATIC_U24:
case Opcode.STATIC_U24_LOAD:
case Opcode.STATIC_U24_STORE:
case Opcode.LOCAL_U24:
case Opcode.LOCAL_U24_LOAD:
case Opcode.LOCAL_U24_STORE:
case Opcode.GLOBAL_U24:
case Opcode.GLOBAL_U24_LOAD:
case Opcode.GLOBAL_U24_STORE:
Expand Down