Add local variables to debug file

drmortalwombat · Apr 9, 2023 · e23ab50 · e23ab50
1 parent 373ef6c
commit e23ab50
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 256 deletions.
diff --git a/include/c64/asm6502.c b/include/c64/asm6502.c
@@ -19,10 +19,10 @@ inline byte asm_zp(byte * ip, AsmIns ins, byte addr)
 	return 2;
 }
 
-inline byte asm_rl(byte * ip, AsmIns ins, byte addr)
+inline byte asm_rl(byte * ip, AsmIns ins, sbyte addr)
 {
 	ip[0] = ins & 0xff;
-	ip[1] = addr;
+	ip[1] = (byte)addr;
 	return 2;
 }
 

diff --git a/include/c64/asm6502.h b/include/c64/asm6502.h
@@ -97,7 +97,7 @@ inline byte asm_ac(byte * ip, AsmIns ins);
 inline byte asm_zp(byte * ip, AsmIns ins, byte addr);
 
 // relative branch
-inline byte asm_rl(byte * ip, AsmIns ins, byte addr);
+inline byte asm_rl(byte * ip, AsmIns ins, sbyte addr);
 
 // immediate
 inline byte asm_im(byte * ip, AsmIns ins, byte value);

diff --git a/oscar64/Compiler.cpp b/oscar64/Compiler.cpp
@@ -1048,17 +1048,16 @@ bool Compiler::WriteDbjFile(const char* filename)
 					InterVariable* v(p->mParamVars[i]);
 					if (v && v->mIdent)
 					{
-						if (v->mLinkerObject)
-						{
-						}
-						else
-						{
-							if (!vfirst)
-								fprintf(file, ",\n");
-							vfirst = false;
+						if (!vfirst)
+							fprintf(file, ",\n");
+						vfirst = false;
 
+						if (p->mFastCallProcedure)
 							fprintf(file, "\t\t\t{\"name\": \"%s\", \"start\": %d, \"end\": %d, \"typeid\": %d}", v->mIdent->mString, i + BC_REG_FPARAMS, i + BC_REG_FPARAMS + v->mSize, types.IndexOrPush(v->mDeclaration->mBase));
-						}
+						else if (p->mFramePointer)
+							fprintf(file, "\t\t\t{\"name\": \"%s\", \"start\": %d, \"end\": %d, \"base\": %d, \"typeid\": %d}", v->mIdent->mString, v->mOffset, v->mOffset + v->mSize, BC_REG_LOCALS, types.IndexOrPush(v->mDeclaration->mBase));
+						else
+							fprintf(file, "\t\t\t{\"name\": \"%s\", \"start\": %d, \"end\": %d, \"base\": %d, \"typeid\": %d}", v->mIdent->mString, v->mOffset, v->mOffset + v->mSize, BC_REG_STACK, types.IndexOrPush(v->mDeclaration->mBase));
 					}
 				}
 				for (int i = 0; i < p->mLocalVars.Size(); i++)
@@ -1077,8 +1076,21 @@ bool Compiler::WriteDbjFile(const char* filename)
 								fprintf(file, "\t\t{\"name\": \"%s\", \"start\": %d, \"end\": %d, \"typeid\": %d}", v->mIdent->mString, v->mLinkerObject->mAddress, v->mLinkerObject->mAddress + v->mLinkerObject->mSize, types.IndexOrPush(v->mDeclaration->mBase));
 							}
 						}
+						else if (p->mFramePointer)
+						{
+							if (!vfirst)
+								fprintf(file, ",\n");
+							vfirst = false;
+
+							fprintf(file, "\t\t\t{\"name\": \"%s\", \"start\": %d, \"end\": %d, \"base\": %d, \"typeid\": %d}", v->mIdent->mString, v->mOffset, v->mOffset + v->mSize, BC_REG_LOCALS, types.IndexOrPush(v->mDeclaration->mBase));
+						}
 						else
 						{
+							if (!vfirst)
+								fprintf(file, ",\n");
+							vfirst = false;
+
+							fprintf(file, "\t\t\t{\"name\": \"%s\", \"start\": %d, \"end\": %d, \"base\": %d, \"typeid\": %d}", v->mIdent->mString, v->mOffset, v->mOffset + v->mSize, BC_REG_STACK, types.IndexOrPush(v->mDeclaration->mBase));
 						}
 					}
 				}

diff --git a/oscar64/GlobalAnalyzer.cpp b/oscar64/GlobalAnalyzer.cpp
@@ -436,6 +436,8 @@ Declaration * GlobalAnalyzer::Analyze(Expression* exp, Declaration* procDec, boo
 
 			return exp->mDecType;
 		}
+		else
+			return Analyze(exp->mLeft, procDec, false);
 		break;
 	case EX_POSTFIX:
 		break;

diff --git a/oscar64/InterCode.cpp b/oscar64/InterCode.cpp
@@ -14531,7 +14531,7 @@ InterCodeProcedure::InterCodeProcedure(InterCodeModule * mod, const Location & l
 	mIdent(ident), mLinkerObject(linkerObject),
 	mNativeProcedure(false), mLeafProcedure(false), mCallsFunctionPointer(false), mCalledFunctions(nullptr), mFastCallProcedure(false), 
 	mInterrupt(false), mHardwareInterrupt(false), mCompiled(false), mInterruptCalled(false), 
-	mSaveTempsLinkerObject(nullptr), mValueReturn(false),
+	mSaveTempsLinkerObject(nullptr), mValueReturn(false), mFramePointer(false),
 	mDeclaration(nullptr)
 {
 	mID = mModule->mProcedures.Size();

diff --git a/oscar64/InterCode.h b/oscar64/InterCode.h
@@ -568,7 +568,7 @@ class InterCodeProcedure
 	GrowingIntArray						mTempOffset, mTempSizes;
 	int									mTempSize, mCommonFrameSize, mCallerSavedTemps, mFreeCallerSavedTemps, mFastCallBase;
 	bool								mLeafProcedure, mNativeProcedure, mCallsFunctionPointer, mHasDynamicStack, mHasInlineAssembler, mCallsByteCode, mFastCallProcedure;
-	bool								mInterrupt, mHardwareInterrupt, mCompiled, mInterruptCalled, mValueReturn;
+	bool								mInterrupt, mHardwareInterrupt, mCompiled, mInterruptCalled, mValueReturn, mFramePointer;
 	GrowingInterCodeProcedurePtrArray	mCalledFunctions;
 
 	InterCodeModule					*	mModule;

diff --git a/oscar64/NativeCodeGenerator.cpp b/oscar64/NativeCodeGenerator.cpp
@@ -38229,6 +38229,11 @@ void NativeCodeProcedure::Compile(InterCodeProcedure* proc)
 	mFrameOffset = 0;
 	mNoFrame = (mStackExpand + proc->mCommonFrameSize) < 64 && !proc->mHasDynamicStack;// && !(proc->mHasInlineAssembler && !proc->mLeafProcedure);
 
+#if 0
+	if (!(proc->mCompilerOptions & COPT_OPTIMIZE_BASIC) && (proc->mCompilerOptions & COPT_DEBUGINFO))
+		mNoFrame = mStackExpand + proc->mCommonFrameSize == 0 && !proc->mHasDynamicStack;
+#endif
+
 	if (mNoFrame)
 		proc->mLinkerObject->mFlags |= LOBJF_NO_FRAME;
 
@@ -38614,6 +38619,18 @@ void NativeCodeProcedure::Compile(InterCodeProcedure* proc)
 		}
 	}
 
+	proc->mFramePointer = !mNoFrame;
+	for (int i = 0; i < proc->mParamVars.Size(); i++)
+	{
+		if (proc->mParamVars[i])
+			proc->mParamVars[i]->mOffset = i + proc->mLocalSize + 2 + mFrameOffset;
+	}
+	for (int i = 0; i < proc->mLocalVars.Size(); i++)
+	{
+		if (proc->mLocalVars[i])
+			proc->mLocalVars[i]->mOffset += mFrameOffset;
+	}
+
 	if (proc->mHardwareInterrupt)
 		mExitBlock->mIns.Push(NativeCodeInstruction(nullptr, ASMIT_RTI, ASMIM_IMPLIED));
 	else

diff --git a/oscar64/oscar64.cpp b/oscar64/oscar64.cpp
@@ -74,7 +74,7 @@ int main2(int argc, const char** argv)
 
 #else
 		strcpy(strProductName, "oscar64");
-		strcpy(strProductVersion, "1.18.196");
+		strcpy(strProductVersion, "1.18.197");
 
 #ifdef __APPLE__
 		uint32_t length = sizeof(basePath);

diff --git a/oscar64/oscar64.rc b/oscar64/oscar64.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,18,196,0
- PRODUCTVERSION 1,18,196,0
+ FILEVERSION 1,18,197,0
+ PRODUCTVERSION 1,18,197,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,12 +43,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "oscar64"
             VALUE "FileDescription", "oscar64 compiler"
-            VALUE "FileVersion", "1.18.196.0"
+            VALUE "FileVersion", "1.18.197.0"
             VALUE "InternalName", "oscar64.exe"
             VALUE "LegalCopyright", "Copyright (C) 2021"
             VALUE "OriginalFilename", "oscar64.exe"
             VALUE "ProductName", "oscar64"
-            VALUE "ProductVersion", "1.18.196.0"
+            VALUE "ProductVersion", "1.18.197.0"
         END
     END
     BLOCK "VarFileInfo"