Allow names of temp vars to be changed, fix bug where main script can…

… only have 1 return statement
MrSapps · Apr 4, 2015 · abe9d99 · abe9d99
1 parent a9aa8eb
commit abe9d99
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/decompiler/ff7_field/ff7_field_codegen.h b/decompiler/ff7_field/ff7_field_codegen.h
@@ -201,13 +201,21 @@ namespace FF7
             case 13:
             case 15:
             {
-                auto address = static_cast<uint32>(valueOrAddress) & 0xFF;
-                auto friendlyName = formatter.VarName(bank, valueOrAddress);
+                const auto address = static_cast<uint32>(valueOrAddress) & 0xFF;
+                const auto friendlyName = formatter.VarName(bank, valueOrAddress);
                 return (boost::format("FFVII.Data.%1%") % (friendlyName == "" ? (boost::format("FFVII.Data.var_%1%_%2%") % bank % address).str() : friendlyName)).str();
             }
             case 5:
             case 6:
-                return (boost::format("FFVII.Data.temp%1%_%2%") % bank % (static_cast<uint32>(valueOrAddress) & 0xFF)).str();
+            {
+                const auto address = static_cast<uint32>(valueOrAddress)& 0xFF;
+                const  auto friendlyName = formatter.VarName(bank, address);
+                if (friendlyName.empty())
+                {
+                    return (boost::format("FFVII.Data.temp%1%_%2%") % bank % address).str();
+                }
+                return "FFVII.Data." + friendlyName;
+            }
             default:
                 //throw UnknownBankException();
                 return (boost::format("FFVII.Data.unknown_%1%_%2%") % bank % (static_cast<uint32>(valueOrAddress) & 0xFF)).str();

diff --git a/decompiler/ff7_field/ff7_field_disassembler.cpp b/decompiler/ff7_field/ff7_field_disassembler.cpp
@@ -284,15 +284,14 @@ void FF7::FF7Disassembler::DisassembleIndivdualScript(std::string entityName,
         auto streamPos = mStream->Position();
         if (streamPos != endPos)
         {
-            // The "main" script we should also only have 1 return statement
-            AddFunc(entityName, entityIndex, scriptIndex, nextScriptEntryPoint, false, isEnd, true, "on_update");
+            // The "main" script can have more than one return statement
+            AddFunc(entityName, entityIndex, scriptIndex, nextScriptEntryPoint, false, isEnd, false, "on_update");
             streamPos = mStream->Position();
+
+            // But should end exactly on the end pos
             if (streamPos != endPos)
             {
-                // We only ever expect 2 return statements in script 0
-                // the first gives us the "init" script, the second gives
-                // us the "main" script, anymore is an error
-                throw TooManyReturnStatementsException();
+                throw InternalDecompilerError();
             }
         }
 

diff --git a/decompiler/unknown_opcode_exception.h b/decompiler/unknown_opcode_exception.h
@@ -36,12 +36,6 @@ class NotImplementedException : public InternalDecompilerError
     NotImplementedException() = default;
 };
 
-class TooManyReturnStatementsException : public InternalDecompilerError
-{
-public:
-    TooManyReturnStatementsException() = default;
-};
-
 class FF7ScriptHeaderInvalidException : public InternalDecompilerError
 {
 public: