* change to load version 15

Codeon-GmbH · Apr 29, 2019 · 325cd45 · 325cd45
1 parent 2440b3a
commit 325cd45
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 16 deletions.
diff --git 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
@@ -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
@@ -1,15 +1,18 @@
-"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"
 "{\n"
 "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
@@ -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
@@ -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"
+"}\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
@@ -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
@@ -1,15 +1,18 @@
-"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"
 "{\n"
 "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
@@ -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
    };