objc runtime 787.1

Author: husihua

README.md

@@ -1,2 +1,2 @@
 # objc-runtime
-objc runtime 779.1
+objc runtime 787.1

libobjc.order

@@ -19,8 +19,6 @@ __objc_update_stubs_in_mach_header
 _sel_init
 ___sel_registerName
 __objc_search_builtins
-__ZNK8objc_opt13objc_selopt_t3getEPKc
-__ZNK8objc_opt13objc_selopt_t4hashEPKc
 _sel_registerName
 _arr_init
 __ZN4objc8DenseMapIP11objc_objectmLb1ENS_12DenseMapInfoIS2_EENS3_ImEEE4initEj

objc.xcodeproj/project.pbxproj

@@ -98,7 +98,7 @@
 		3044E26323D4626F006763E3 /* dyld_priv.h in Headers */ = {isa = PBXBuildFile; fileRef = 3044E22023D4626F006763E3 /* dyld_priv.h */; };
 		3044E26423D4626F006763E3 /* OSCrossEndian.h in Headers */ = {isa = PBXBuildFile; fileRef = 3044E22223D4626F006763E3 /* OSCrossEndian.h */; };
 		3044E26C23D47C0E006763E3 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 3044E26B23D47C0E006763E3 /* main.m */; };
-		3044E27223D47C4F006763E3 /* libobjc.A.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AAC0630554660B00DB518D /* libobjc.A.dylib */; };
+		309850AD25383A9700054FB3 /* libobjc.A.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D2AAC0630554660B00DB518D /* libobjc.A.dylib */; };
 		393CEAC00DC69E3E000B69DE /* objc-references.mm in Sources */ = {isa = PBXBuildFile; fileRef = 393CEABF0DC69E3E000B69DE /* objc-references.mm */; };
 		393CEAC60DC69E67000B69DE /* objc-references.h in Headers */ = {isa = PBXBuildFile; fileRef = 393CEAC50DC69E67000B69DE /* objc-references.h */; };
 		39ABD72312F0B61800D1054C /* objc-weak.h in Headers */ = {isa = PBXBuildFile; fileRef = 39ABD71F12F0B61800D1054C /* objc-weak.h */; };
@@ -397,7 +397,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3044E27223D47C4F006763E3 /* libobjc.A.dylib in Frameworks */,
+				309850AD25383A9700054FB3 /* libobjc.A.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -969,7 +969,6 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				BuildIndependentTargetsInParallel = NO;
 				LastUpgradeCheck = 1130;
 				TargetAttributes = {
 					3044E26823D47C0E006763E3 = {

runtime/Messengers.subproj/objc-msg-arm.s

@@ -222,6 +222,40 @@ LExit$0:
 .endmacro
 
 
+//////////////////////////////////////////////////////////////////////
+//
+// SAVE_REGS
+//
+// Create a stack frame and save all argument registers in preparation
+// for a function call.
+//////////////////////////////////////////////////////////////////////
+
+.macro SAVE_REGS
+
+	stmfd	sp!, {r0-r3,r7,lr}
+	add	r7, sp, #16
+	sub	sp, #8			// align stack
+	FP_SAVE
+
+.endmacro
+
+
+//////////////////////////////////////////////////////////////////////
+//
+// RESTORE_REGS
+//
+// Restore all argument registers and pop the stack frame created by
+// SAVE_REGS.
+//////////////////////////////////////////////////////////////////////
+
+.macro RESTORE_REGS
+
+	FP_RESTORE
+	add	sp, #8			// align stack
+	ldmfd	sp!, {r0-r3,r7,lr}
+
+.endmacro
+
 /////////////////////////////////////////////////////////////////////
 //
 // CacheLookup	NORMAL|STRET <function>
@@ -666,10 +700,7 @@ LNilReceiver:
 	
 .macro MethodTableLookup
 	
-	stmfd	sp!, {r0-r3,r7,lr}
-	add	r7, sp, #16
-	sub	sp, #8			// align stack
-	FP_SAVE
+	SAVE_REGS
 
 	// lookUpImpOrForward(obj, sel, cls, LOOKUP_INITIALIZE | LOOKUP_RESOLVER)
 .if $0 == NORMAL
@@ -690,9 +721,7 @@ LNilReceiver:
 	tst	r12, r12		// set ne for stret forwarding
 .endif
 
-	FP_RESTORE
-	add	sp, #8			// align stack
-	ldmfd	sp!, {r0-r3,r7,lr}
+	RESTORE_REGS
 
 .endmacro
 
@@ -819,18 +848,55 @@ LNilReceiver:
 
 
 	ENTRY _method_invoke
+
+	// See if this is a small method.
+	lsls	r12, r1, #31
+	bne.w	L_method_invoke_small
+
+	// We can directly load the IMP from big methods.
 	// r1 is method triplet instead of SEL
 	ldr	r12, [r1, #METHOD_IMP]
 	ldr	r1, [r1, #METHOD_NAME]
 	bx	r12
+
+L_method_invoke_small:
+	// Small methods require a call to handle swizzling.
+	SAVE_REGS
+	mov	r0, r1
+	bl	__method_getImplementationAndName
+	mov	r12, r0
+	mov	r9, r1
+	RESTORE_REGS
+	mov	r1, r9
+	bx	r12
+
+
 	END_ENTRY _method_invoke
 
 
 	ENTRY _method_invoke_stret
+
+	// See if this is a small method.
+	lsls	r12, r2, #31
+	bne.w	L_method_invoke_stret_small
+
+	// We can directly load the IMP from big methods.
 	// r2 is method triplet instead of SEL
 	ldr	r12, [r2, #METHOD_IMP]
 	ldr	r2, [r2, #METHOD_NAME]
 	bx	r12
+
+L_method_invoke_stret_small:
+	// Small methods require a call to handle swizzling.
+	SAVE_REGS
+	mov	r0, r2
+	bl	__method_getImplementationAndName
+	mov	r12, r0
+	mov	r9, r1
+	RESTORE_REGS
+	mov	r2, r9
+	bx	r12
+
 	END_ENTRY _method_invoke_stret
 	
 

runtime/Messengers.subproj/objc-msg-arm64.s

@@ -169,6 +169,63 @@ LExit$0:
 #define FrameWithNoSaves 0x04000000  // frame, no non-volatile saves
 
 
+//////////////////////////////////////////////////////////////////////
+//
+// SAVE_REGS
+//
+// Create a stack frame and save all argument registers in preparation
+// for a function call.
+//////////////////////////////////////////////////////////////////////
+
+.macro SAVE_REGS
+
+    // push frame
+    SignLR
+    stp    fp, lr, [sp, #-16]!
+    mov    fp, sp
+
+    // save parameter registers: x0..x8, q0..q7
+    sub    sp, sp, #(10*8 + 8*16)
+    stp    q0, q1, [sp, #(0*16)]
+    stp    q2, q3, [sp, #(2*16)]
+    stp    q4, q5, [sp, #(4*16)]
+    stp    q6, q7, [sp, #(6*16)]
+    stp    x0, x1, [sp, #(8*16+0*8)]
+    stp    x2, x3, [sp, #(8*16+2*8)]
+    stp    x4, x5, [sp, #(8*16+4*8)]
+    stp    x6, x7, [sp, #(8*16+6*8)]
+    str    x8,     [sp, #(8*16+8*8)]
+
+.endmacro
+
+
+//////////////////////////////////////////////////////////////////////
+//
+// RESTORE_REGS
+//
+// Restore all argument registers and pop the stack frame created by
+// SAVE_REGS.
+//////////////////////////////////////////////////////////////////////
+
+.macro RESTORE_REGS
+
+    ldp    q0, q1, [sp, #(0*16)]
+    ldp    q2, q3, [sp, #(2*16)]
+    ldp    q4, q5, [sp, #(4*16)]
+    ldp    q6, q7, [sp, #(6*16)]
+    ldp    x0, x1, [sp, #(8*16+0*8)]
+    ldp    x2, x3, [sp, #(8*16+2*8)]
+    ldp    x4, x5, [sp, #(8*16+4*8)]
+    ldp    x6, x7, [sp, #(8*16+6*8)]
+    ldr    x8,     [sp, #(8*16+8*8)]
+
+    mov    sp, fp
+    ldp    fp, lr, [sp], #16
+    AuthenticateLR
+
+.endmacro
+
+
 /********************************************************************
  *
  * CacheLookup NORMAL|GETIMP|LOOKUP <function>
@@ -494,22 +551,7 @@ LLookup_Nil:
 
 .macro MethodTableLookup
 	
-	// push frame
-	SignLR
-	stp	fp, lr, [sp, #-16]!
-	mov	fp, sp
-
-	// save parameter registers: x0..x8, q0..q7
-	sub	sp, sp, #(10*8 + 8*16)
-	stp	q0, q1, [sp, #(0*16)]
-	stp	q2, q3, [sp, #(2*16)]
-	stp	q4, q5, [sp, #(4*16)]
-	stp	q6, q7, [sp, #(6*16)]
-	stp	x0, x1, [sp, #(8*16+0*8)]
-	stp	x2, x3, [sp, #(8*16+2*8)]
-	stp	x4, x5, [sp, #(8*16+4*8)]
-	stp	x6, x7, [sp, #(8*16+6*8)]
-	str	x8,     [sp, #(8*16+8*8)]
+	SAVE_REGS
 
 	// lookUpImpOrForward(obj, sel, cls, LOOKUP_INITIALIZE | LOOKUP_RESOLVER)
 	// receiver and selector already in x0 and x1
@@ -519,21 +561,8 @@ LLookup_Nil:
 
 	// IMP in x0
 	mov	x17, x0
-	
-	// restore registers and return
-	ldp	q0, q1, [sp, #(0*16)]
-	ldp	q2, q3, [sp, #(2*16)]
-	ldp	q4, q5, [sp, #(4*16)]
-	ldp	q6, q7, [sp, #(6*16)]
-	ldp	x0, x1, [sp, #(8*16+0*8)]
-	ldp	x2, x3, [sp, #(8*16+2*8)]
-	ldp	x4, x5, [sp, #(8*16+4*8)]
-	ldp	x6, x7, [sp, #(8*16+6*8)]
-	ldr	x8,     [sp, #(8*16+8*8)]
-
-	mov	sp, fp
-	ldp	fp, lr, [sp], #16
-	AuthenticateLR
+
+	RESTORE_REGS
 
 .endmacro
 
@@ -615,11 +644,37 @@ LGetImpMiss:
 
 	
 	ENTRY _method_invoke
+
+	// See if this is a small method.
+	tbnz	p1, #0, L_method_invoke_small
+
+	// We can directly load the IMP from big methods.
 	// x1 is method triplet instead of SEL
 	add	p16, p1, #METHOD_IMP
 	ldr	p17, [x16]
 	ldr	p1, [x1, #METHOD_NAME]
 	TailCallMethodListImp x17, x16
+
+L_method_invoke_small:
+	// Small methods require a call to handle swizzling.
+	SAVE_REGS
+	mov	p0, p1
+	bl	__method_getImplementationAndName
+	// ARM64_32 packs both return values into x0, with SEL in the high bits and IMP in the low.
+	// ARM64 just returns them in x0 and x1.
+	mov	x17, x0
+#if __LP64__
+	mov	x16, x1
+#endif
+	RESTORE_REGS
+#if __LP64__
+	mov	x1, x16
+#else
+	lsr	x1, x17, #32
+	mov	w17, w17
+#endif
+	TailCallFunctionPointer x17
+
 	END_ENTRY _method_invoke
 
 #endif