Merge pull request #92 from bytedance/dev/suxiangyu

 fix: insufficient NOP instruction padding in arm64

Author: ycydsxy

internal/monkey/mem/write_darwin_arm64.s

@@ -16,10 +16,11 @@
 
 #include "textflag.h"
 
-#define NOP64 WORD $0x1f2003d5; WORD $0x1f2003d5;
+#define NOP8 WORD $0x1f2003d5; WORD $0x1f2003d5;
+#define NOP64 NOP8; NOP8; NOP8; NOP8; NOP8; NOP8; NOP8; NOP8;
 #define NOP512 NOP64; NOP64; NOP64; NOP64; NOP64; NOP64; NOP64; NOP64;
 #define NOP4096 NOP512; NOP512; NOP512; NOP512; NOP512; NOP512; NOP512; NOP512;
-#define NOP16384 NOP4096; NOP4096; NOP4096; NOP4096; NOP4096; NOP4096; NOP4096; NOP4096;
+#define NOP16384 NOP4096; NOP4096; NOP4096; NOP4096;
 
 #define protRW $(0x1|0x2|0x10)
 #define mProtect $(0x2000000+74)

internal/monkey/mem/write_linux_arm64.s

@@ -16,10 +16,11 @@
 
 #include "textflag.h"
 
-#define NOP64 WORD $0x1f2003d5; WORD $0x1f2003d5;
+#define NOP8 WORD $0x1f2003d5; WORD $0x1f2003d5;
+#define NOP64 NOP8; NOP8; NOP8; NOP8; NOP8; NOP8; NOP8; NOP8;
 #define NOP512 NOP64; NOP64; NOP64; NOP64; NOP64; NOP64; NOP64; NOP64;
 #define NOP4096 NOP512; NOP512; NOP512; NOP512; NOP512; NOP512; NOP512; NOP512;
-#define NOP16384 NOP4096; NOP4096; NOP4096; NOP4096; NOP4096; NOP4096; NOP4096; NOP4096;
+#define NOP16384 NOP4096; NOP4096; NOP4096; NOP4096;
 
 #define protRW $(0x1|0x2)
 #define mProtect $0xe2

mock_condition.go

@@ -106,7 +106,7 @@ func (m *mockCondition) SetToForce(to interface{}) {
 
 // checkGenericAndReceiver check if typ has GenericsInfo and selfReceiver as argument
 //
-// The hook function will looks like func(_ GenericInfo, self *struct, arg0 int ...)
+// The hook function will look like func(_ GenericInfo, self *struct, arg0 int ...)
 // When we use 'When' or 'To', our input hook function will looks like:
 //  1. func(arg0 int ...)
 //  2. func(info GenericInfo, arg0 int ...)