From 325cd45136b83661162c20706d95843da0f8a5d2 Mon Sep 17 00:00:00 2001 From: Nat! Date: Mon, 29 Apr 2019 17:14:54 +0200 Subject: [PATCH] * change to load version 15 --- source/Expression/ExpressionSourceCode.cpp | 2 +- .../ObjC/MulleObjCRuntime/MulleObjCTrampolineHandler.cpp | 6 +++--- .../mulle-objc-dangerous-class-storage.inc | 7 +++++-- .../mulle-objc-dangerous-class-storage.src | 8 ++++---- .../ObjC/MulleObjCRuntime/mulle-objc-lookup-imp.inc | 4 ++-- .../ObjC/MulleObjCRuntime/mulle-objc-lookup-imp.src | 2 +- .../ObjC/MulleObjCRuntime/mulle-objc-object-checker.inc | 7 +++++-- .../ObjC/MulleObjCRuntime/mulle-objc-object-checker.src | 2 +- 8 files changed, 22 insertions(+), 16 deletions(-) diff --git a/source/Expression/ExpressionSourceCode.cpp b/source/Expression/ExpressionSourceCode.cpp index 132f277e40..72fc89ab81 100644 --- a/source/Expression/ExpressionSourceCode.cpp +++ b/source/Expression/ExpressionSourceCode.cpp @@ -287,7 +287,7 @@ static const struct mulle_clang_objccompilerinfo\n\ unsigned int runtime_version;\n\ } __mulle_objc_objccompilerinfo =\n\ {\n\ - 14, // load version must match \n\ + 15, // @mulle-objc@ load version must match \n\ 0 // 0 to not emit __load_mulle_objc\n\ };\n\ "); diff --git a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/MulleObjCTrampolineHandler.cpp b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/MulleObjCTrampolineHandler.cpp index e70fbe1f37..0d5ab0fd69 100644 --- a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/MulleObjCTrampolineHandler.cpp +++ b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/MulleObjCTrampolineHandler.cpp @@ -628,15 +628,15 @@ MulleObjCTrampolineHandler::GetStepThroughDispatchPlan( Thread &thread, int_value.GetScalar() = 1; else if( this_dispatch.has_class_argument) - int_value.GetScalar() = 2; // FIXME - Set to 0 when debugging is done. + int_value.GetScalar() = 2; else - int_value.GetScalar() = 0; // FIXME - Set to 0 when debugging is done. + int_value.GetScalar() = 0; dispatch_values.PushValue(int_value); if (log && log->GetVerbose()) int_value.GetScalar() = 1; else - int_value.GetScalar() = 0; // FIXME - Set to 0 when debugging is done. + int_value.GetScalar() = 0; dispatch_values.PushValue( int_value); // The step through code might have to fill in the cache, so it is not safe to run only one thread. diff --git a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-dangerous-class-storage.inc b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-dangerous-class-storage.inc index 120a4a9501..e8c78cfef3 100644 --- a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-dangerous-class-storage.inc +++ b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-dangerous-class-storage.inc @@ -1,11 +1,13 @@ -"static const \n" +"extern \"C\"\n" +"{\n" +"static const\n" "struct mulle_clang_objccompilerinfo\n" "{\n" "unsigned int load_version;\n" "unsigned int runtime_version;\n" "} __mulle_objc_objccompilerinfo =\n" "{\n" -"14, \n" +"15, \n" "0 \n" "};\n" "void *__lldb_objc_get_dangerous_class_storage( void)\n" @@ -13,3 +15,4 @@ "extern void *mulle_objc_lldb_get_dangerous_classstorage_pointer( void);\n" "return( mulle_objc_lldb_get_dangerous_classstorage_pointer());\n" "}\n" +"}\n" diff --git a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-dangerous-class-storage.src b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-dangerous-class-storage.src index a993e80770..601d458c33 100644 --- a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-dangerous-class-storage.src +++ b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-dangerous-class-storage.src @@ -3,12 +3,12 @@ extern "C" static const struct mulle_clang_objccompilerinfo { - unsigned int load_version; - unsigned int runtime_version; + unsigned int load_version; + unsigned int runtime_version; } __mulle_objc_objccompilerinfo = { - 14, // load version must match - 0 // 0 to not emit __load_mulle_objc + 15, // @mulle-objc@ load version must match + 0 // 0 to not emit __load_mulle_objc }; diff --git a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-lookup-imp.inc b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-lookup-imp.inc index ff563290b2..ed98e9b370 100644 --- a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-lookup-imp.inc +++ b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-lookup-imp.inc @@ -7,7 +7,7 @@ "unsigned int runtime_version;\n" "} __mulle_objc_objccompilerinfo =\n" "{\n" -"14, \n" +"15, \n" "0 \n" "};\n" "void *__lldb_objc_find_implementation_for_selector( void *object,\n" @@ -27,4 +27,4 @@ "is_superid,\n" "debug));\n" "}\n" -"}\n" \ No newline at end of file +"}\n" diff --git a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-lookup-imp.src b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-lookup-imp.src index de05256a73..078e68d667 100644 --- a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-lookup-imp.src +++ b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-lookup-imp.src @@ -7,7 +7,7 @@ extern "C" unsigned int runtime_version; } __mulle_objc_objccompilerinfo = { - 14, // load version must match + 15, // @mulle-objc@ load version must match 0 // 0 to not emit __load_mulle_objc }; diff --git a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-object-checker.inc b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-object-checker.inc index 85908dd931..d0c623f62e 100644 --- a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-object-checker.inc +++ b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-object-checker.inc @@ -1,11 +1,13 @@ -"static const \n" +"extern \"C\"\n" +"{\n" +"static const\n" "struct mulle_clang_objccompilerinfo\n" "{\n" "unsigned int load_version;\n" "unsigned int runtime_version;\n" "} __mulle_objc_objccompilerinfo =\n" "{\n" -"14, \n" +"15, \n" "0 \n" "};\n" "void %s( void *$__lldb_obj, unsigned int $__lldb_sel)\n" @@ -13,3 +15,4 @@ "extern void mulle_objc_lldb_check_object( void *$__lldb_obj, unsigned int $__lldb_sel);\n" "mulle_objc_lldb_check_object( $__lldb_obj, $__lldb_sel);\n" "}\n" +"}\n" diff --git a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-object-checker.src b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-object-checker.src index c15adc332d..263674ac53 100644 --- a/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-object-checker.src +++ b/source/Plugins/LanguageRuntime/ObjC/MulleObjCRuntime/mulle-objc-object-checker.src @@ -7,7 +7,7 @@ extern "C" unsigned int runtime_version; } __mulle_objc_objccompilerinfo = { - 14, // load version must match + 15, // @mulle-objc@ load version must match 0 // 0 to not emit __load_mulle_objc };