Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 04:22:20 +02:00
Code Activity

Fixed ARM linking issue and 'step into' for BeefProgramStart

Browse source
This commit is contained in:
Brian Fiete 2019-10-23 11:30:59 -07:00
parent 2693dbfaca
commit 2196c8c669
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
IDE/src/IDEApp.bf
View file

@ -9734,7 +9734,7 @@ namespace IDE
//mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("_ZN3Hey4Dude3Bro9TestClass4MainEv"); //mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("_ZN3Hey4Dude3Bro9TestClass4MainEv");
if ((project.mGeneralOptions.mTargetType == Project.TargetType.BeefConsoleApplication) || if ((project.mGeneralOptions.mTargetType == Project.TargetType.BeefConsoleApplication) ||
(project.mGeneralOptions.mTargetType == Project.TargetType.BeefWindowsApplication)) (project.mGeneralOptions.mTargetType == Project.TargetType.BeefWindowsApplication))
mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("-BeefMain"); mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("-BeefStartProgram");
else else
{ {
mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("-main"); mMainBreakpoint = mDebugger.CreateSymbolBreakpoint("-main");
@ -11229,7 +11229,7 @@ namespace IDE
mDebugger.UpdateCallStack(); mDebugger.UpdateCallStack();
var stackInfo = scope String(); var stackInfo = scope String();
mDebugger.GetStackFrameInfo(0, out addr, fileName, stackInfo); mDebugger.GetStackFrameInfo(0, out addr, fileName, stackInfo);
if (stackInfo.Contains("Main")) if (stackInfo.Contains("BeefStartProgram"))
{ {
// Okay, NOW we can do a "step into" // Okay, NOW we can do a "step into"
if (!IsInDisassemblyMode()) if (!IsInDisassemblyMode())

8
IDEHelper/CMakeLists.txt
View file

@ -230,6 +230,14 @@ else()
${LLVM_LIB}/libLLVMX86AsmParser.a ${LLVM_LIB}/libLLVMX86AsmParser.a
${LLVM_LIB}/libLLVMX86Disassembler.a ${LLVM_LIB}/libLLVMX86Disassembler.a
${LLVM_LIB}/libLLVMARMInfo.a
${LLVM_LIB}/libLLVMARMUtils.a
${LLVM_LIB}/libLLVMARMAsmPrinter.a
${LLVM_LIB}/libLLVMARMDesc.a
${LLVM_LIB}/libLLVMARMCodeGen.a
${LLVM_LIB}/libLLVMARMAsmParser.a
${LLVM_LIB}/libLLVMARMDisassembler.a
${LLVM_LIB}/libLLVMAArch64Info.a ${LLVM_LIB}/libLLVMAArch64Info.a
${LLVM_LIB}/libLLVMAArch64Utils.a ${LLVM_LIB}/libLLVMAArch64Utils.a
${LLVM_LIB}/libLLVMAArch64AsmPrinter.a ${LLVM_LIB}/libLLVMAArch64AsmPrinter.a

3
IDEHelper/Compiler/BfCompiler.cpp
View file

@ -8187,7 +8187,8 @@ BF_EXPORT void BF_CALLTYPE BfCompiler_SetOptions(BfCompiler* bfCompiler, BfProje
options->mCLongSize = 4; options->mCLongSize = 4;
if ((options->mMachineType == BfMachineType_AArch64) || (options->mMachineType == BfMachineType_x64)) if ((options->mMachineType == BfMachineType_AArch64) || (options->mMachineType == BfMachineType_x64))
{ {
if ((options->mPlatformType == BfPlatformType_macOS) || (options->mPlatformType == BfPlatformType_iOS) || (options->mPlatformType == BfPlatformType_Android)) if ((options->mPlatformType == BfPlatformType_macOS) || (options->mPlatformType == BfPlatformType_iOS) ||
(options->mPlatformType == BfPlatformType_Linux) || (options->mPlatformType == BfPlatformType_Android))
options->mCLongSize = 8; options->mCLongSize = 8;
} }