1.1 --- a/src/share/vm/prims/unsafe.cpp Tue Feb 23 18:58:36 2016 -0500
1.2 +++ b/src/share/vm/prims/unsafe.cpp Thu Jun 14 09:15:08 2018 -0700
1.3 @@ -1350,47 +1350,47 @@
1.4
1.5 #define LANG "Ljava/lang/"
1.6
1.7 -#define OBJ LANG"Object;"
1.8 -#define CLS LANG"Class;"
1.9 -#define CTR LANG"reflect/Constructor;"
1.10 -#define FLD LANG"reflect/Field;"
1.11 -#define MTH LANG"reflect/Method;"
1.12 -#define THR LANG"Throwable;"
1.13 +#define OBJ LANG "Object;"
1.14 +#define CLS LANG "Class;"
1.15 +#define CTR LANG "reflect/Constructor;"
1.16 +#define FLD LANG "reflect/Field;"
1.17 +#define MTH LANG "reflect/Method;"
1.18 +#define THR LANG "Throwable;"
1.19
1.20 -#define DC0_Args LANG"String;[BII"
1.21 -#define DC_Args DC0_Args LANG"ClassLoader;" "Ljava/security/ProtectionDomain;"
1.22 +#define DC0_Args LANG "String;[BII"
1.23 +#define DC_Args DC0_Args LANG "ClassLoader;" "Ljava/security/ProtectionDomain;"
1.24
1.25 #define CC (char*) /*cast a literal from (const char*)*/
1.26 #define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
1.27
1.28 // define deprecated accessors for compabitility with 1.4.0
1.29 #define DECLARE_GETSETOOP_140(Boolean, Z) \
1.30 - {CC"get"#Boolean, CC"("OBJ"I)"#Z, FN_PTR(Unsafe_Get##Boolean##140)}, \
1.31 - {CC"put"#Boolean, CC"("OBJ"I"#Z")V", FN_PTR(Unsafe_Set##Boolean##140)}
1.32 + {CC "get" #Boolean, CC "(" OBJ "I)" #Z, FN_PTR(Unsafe_Get##Boolean##140)}, \
1.33 + {CC "put" #Boolean, CC "(" OBJ "I" #Z ")V", FN_PTR(Unsafe_Set##Boolean##140)}
1.34
1.35 // Note: In 1.4.1, getObject and kin take both int and long offsets.
1.36 #define DECLARE_GETSETOOP_141(Boolean, Z) \
1.37 - {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \
1.38 - {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)}
1.39 + {CC "get" #Boolean, CC "(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean)}, \
1.40 + {CC "put" #Boolean, CC "(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean)}
1.41
1.42 // Note: In 1.5.0, there are volatile versions too
1.43 #define DECLARE_GETSETOOP(Boolean, Z) \
1.44 - {CC"get"#Boolean, CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean)}, \
1.45 - {CC"put"#Boolean, CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean)}, \
1.46 - {CC"get"#Boolean"Volatile", CC"("OBJ"J)"#Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \
1.47 - {CC"put"#Boolean"Volatile", CC"("OBJ"J"#Z")V", FN_PTR(Unsafe_Set##Boolean##Volatile)}
1.48 + {CC "get" #Boolean, CC "(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean)}, \
1.49 + {CC "put" #Boolean, CC "(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean)}, \
1.50 + {CC "get" #Boolean "Volatile", CC "(" OBJ "J)" #Z, FN_PTR(Unsafe_Get##Boolean##Volatile)}, \
1.51 + {CC "put" #Boolean "Volatile", CC "(" OBJ "J" #Z ")V", FN_PTR(Unsafe_Set##Boolean##Volatile)}
1.52
1.53
1.54 #define DECLARE_GETSETNATIVE(Byte, B) \
1.55 - {CC"get"#Byte, CC"("ADR")"#B, FN_PTR(Unsafe_GetNative##Byte)}, \
1.56 - {CC"put"#Byte, CC"("ADR#B")V", FN_PTR(Unsafe_SetNative##Byte)}
1.57 + {CC "get" #Byte, CC "(" ADR ")" #B, FN_PTR(Unsafe_GetNative##Byte)}, \
1.58 + {CC "put" #Byte, CC "(" ADR#B ")V", FN_PTR(Unsafe_SetNative##Byte)}
1.59
1.60
1.61
1.62 // These are the methods for 1.4.0
1.63 static JNINativeMethod methods_140[] = {
1.64 - {CC"getObject", CC"("OBJ"I)"OBJ"", FN_PTR(Unsafe_GetObject140)},
1.65 - {CC"putObject", CC"("OBJ"I"OBJ")V", FN_PTR(Unsafe_SetObject140)},
1.66 + {CC "getObject", CC "(" OBJ "I)" OBJ "", FN_PTR(Unsafe_GetObject140)},
1.67 + {CC "putObject", CC "(" OBJ "I" OBJ ")V", FN_PTR(Unsafe_SetObject140)},
1.68
1.69 DECLARE_GETSETOOP_140(Boolean, Z),
1.70 DECLARE_GETSETOOP_140(Byte, B),
1.71 @@ -1409,33 +1409,33 @@
1.72 DECLARE_GETSETNATIVE(Float, F),
1.73 DECLARE_GETSETNATIVE(Double, D),
1.74
1.75 - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
1.76 - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
1.77 + {CC "getAddress", CC "(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
1.78 + {CC "putAddress", CC "(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
1.79
1.80 - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
1.81 - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
1.82 - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
1.83 + {CC "allocateMemory", CC "(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
1.84 + {CC "reallocateMemory", CC "(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
1.85 + {CC "freeMemory", CC "(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
1.86
1.87 - {CC"fieldOffset", CC"("FLD")I", FN_PTR(Unsafe_FieldOffset)},
1.88 - {CC"staticFieldBase", CC"("CLS")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)},
1.89 - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
1.90 - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
1.91 - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
1.92 - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
1.93 - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
1.94 + {CC "fieldOffset", CC "(" FLD ")I", FN_PTR(Unsafe_FieldOffset)},
1.95 + {CC "staticFieldBase", CC "(" CLS ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromClass)},
1.96 + {CC "ensureClassInitialized",CC "(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)},
1.97 + {CC "arrayBaseOffset", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)},
1.98 + {CC "arrayIndexScale", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
1.99 + {CC "addressSize", CC "()I", FN_PTR(Unsafe_AddressSize)},
1.100 + {CC "pageSize", CC "()I", FN_PTR(Unsafe_PageSize)},
1.101
1.102 - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
1.103 - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
1.104 - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
1.105 - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
1.106 - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
1.107 - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}
1.108 + {CC "defineClass", CC "(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)},
1.109 + {CC "defineClass", CC "(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)},
1.110 + {CC "allocateInstance", CC "(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
1.111 + {CC "monitorEnter", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)},
1.112 + {CC "monitorExit", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)},
1.113 + {CC "throwException", CC "(" THR ")V", FN_PTR(Unsafe_ThrowException)}
1.114 };
1.115
1.116 // These are the methods prior to the JSR 166 changes in 1.5.0
1.117 static JNINativeMethod methods_141[] = {
1.118 - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
1.119 - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)},
1.120 + {CC "getObject", CC "(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)},
1.121 + {CC "putObject", CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)},
1.122
1.123 DECLARE_GETSETOOP_141(Boolean, Z),
1.124 DECLARE_GETSETOOP_141(Byte, B),
1.125 @@ -1454,37 +1454,37 @@
1.126 DECLARE_GETSETNATIVE(Float, F),
1.127 DECLARE_GETSETNATIVE(Double, D),
1.128
1.129 - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
1.130 - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
1.131 + {CC "getAddress", CC "(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
1.132 + {CC "putAddress", CC "(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
1.133
1.134 - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
1.135 - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
1.136 - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
1.137 + {CC "allocateMemory", CC "(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
1.138 + {CC "reallocateMemory", CC "(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
1.139 + {CC "freeMemory", CC "(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
1.140
1.141 - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
1.142 - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
1.143 - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
1.144 - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
1.145 - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
1.146 - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
1.147 - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
1.148 - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
1.149 + {CC "objectFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
1.150 + {CC "staticFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
1.151 + {CC "staticFieldBase", CC "(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
1.152 + {CC "ensureClassInitialized",CC "(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)},
1.153 + {CC "arrayBaseOffset", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)},
1.154 + {CC "arrayIndexScale", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
1.155 + {CC "addressSize", CC "()I", FN_PTR(Unsafe_AddressSize)},
1.156 + {CC "pageSize", CC "()I", FN_PTR(Unsafe_PageSize)},
1.157
1.158 - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
1.159 - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
1.160 - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
1.161 - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
1.162 - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
1.163 - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)}
1.164 + {CC "defineClass", CC "(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)},
1.165 + {CC "defineClass", CC "(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)},
1.166 + {CC "allocateInstance", CC "(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
1.167 + {CC "monitorEnter", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)},
1.168 + {CC "monitorExit", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)},
1.169 + {CC "throwException", CC "(" THR ")V", FN_PTR(Unsafe_ThrowException)}
1.170
1.171 };
1.172
1.173 // These are the methods prior to the JSR 166 changes in 1.6.0
1.174 static JNINativeMethod methods_15[] = {
1.175 - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
1.176 - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)},
1.177 - {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)},
1.178 - {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)},
1.179 + {CC "getObject", CC "(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)},
1.180 + {CC "putObject", CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)},
1.181 + {CC "getObjectVolatile",CC "(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)},
1.182 + {CC "putObjectVolatile",CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)},
1.183
1.184
1.185 DECLARE_GETSETOOP(Boolean, Z),
1.186 @@ -1504,42 +1504,42 @@
1.187 DECLARE_GETSETNATIVE(Float, F),
1.188 DECLARE_GETSETNATIVE(Double, D),
1.189
1.190 - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
1.191 - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
1.192 + {CC "getAddress", CC "(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
1.193 + {CC "putAddress", CC "(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
1.194
1.195 - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
1.196 - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
1.197 - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
1.198 + {CC "allocateMemory", CC "(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
1.199 + {CC "reallocateMemory", CC "(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
1.200 + {CC "freeMemory", CC "(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
1.201
1.202 - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
1.203 - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
1.204 - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
1.205 - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
1.206 - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
1.207 - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
1.208 - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
1.209 - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
1.210 + {CC "objectFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
1.211 + {CC "staticFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
1.212 + {CC "staticFieldBase", CC "(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
1.213 + {CC "ensureClassInitialized",CC "(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)},
1.214 + {CC "arrayBaseOffset", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)},
1.215 + {CC "arrayIndexScale", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
1.216 + {CC "addressSize", CC "()I", FN_PTR(Unsafe_AddressSize)},
1.217 + {CC "pageSize", CC "()I", FN_PTR(Unsafe_PageSize)},
1.218
1.219 - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
1.220 - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
1.221 - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
1.222 - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
1.223 - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
1.224 - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)},
1.225 - {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
1.226 - {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
1.227 - {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
1.228 - {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)},
1.229 - {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)}
1.230 + {CC "defineClass", CC "(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)},
1.231 + {CC "defineClass", CC "(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)},
1.232 + {CC "allocateInstance", CC "(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
1.233 + {CC "monitorEnter", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)},
1.234 + {CC "monitorExit", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)},
1.235 + {CC "throwException", CC "(" THR ")V", FN_PTR(Unsafe_ThrowException)},
1.236 + {CC "compareAndSwapObject", CC "(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
1.237 + {CC "compareAndSwapInt", CC "(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
1.238 + {CC "compareAndSwapLong", CC "(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
1.239 + {CC "park", CC "(ZJ)V", FN_PTR(Unsafe_Park)},
1.240 + {CC "unpark", CC "(" OBJ ")V", FN_PTR(Unsafe_Unpark)}
1.241
1.242 };
1.243
1.244 // These are the methods for 1.6.0 and 1.7.0
1.245 static JNINativeMethod methods_16[] = {
1.246 - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
1.247 - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)},
1.248 - {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)},
1.249 - {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)},
1.250 + {CC "getObject", CC "(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)},
1.251 + {CC "putObject", CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)},
1.252 + {CC "getObjectVolatile",CC "(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)},
1.253 + {CC "putObjectVolatile",CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)},
1.254
1.255 DECLARE_GETSETOOP(Boolean, Z),
1.256 DECLARE_GETSETOOP(Byte, B),
1.257 @@ -1558,45 +1558,45 @@
1.258 DECLARE_GETSETNATIVE(Float, F),
1.259 DECLARE_GETSETNATIVE(Double, D),
1.260
1.261 - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
1.262 - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
1.263 + {CC "getAddress", CC "(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
1.264 + {CC "putAddress", CC "(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
1.265
1.266 - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
1.267 - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
1.268 - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
1.269 + {CC "allocateMemory", CC "(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
1.270 + {CC "reallocateMemory", CC "(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
1.271 + {CC "freeMemory", CC "(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
1.272
1.273 - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
1.274 - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
1.275 - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
1.276 - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
1.277 - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
1.278 - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
1.279 - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
1.280 - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
1.281 + {CC "objectFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
1.282 + {CC "staticFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
1.283 + {CC "staticFieldBase", CC "(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
1.284 + {CC "ensureClassInitialized",CC "(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)},
1.285 + {CC "arrayBaseOffset", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)},
1.286 + {CC "arrayIndexScale", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
1.287 + {CC "addressSize", CC "()I", FN_PTR(Unsafe_AddressSize)},
1.288 + {CC "pageSize", CC "()I", FN_PTR(Unsafe_PageSize)},
1.289
1.290 - {CC"defineClass", CC"("DC0_Args")"CLS, FN_PTR(Unsafe_DefineClass0)},
1.291 - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
1.292 - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
1.293 - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
1.294 - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
1.295 - {CC"tryMonitorEnter", CC"("OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)},
1.296 - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)},
1.297 - {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
1.298 - {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
1.299 - {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
1.300 - {CC"putOrderedObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetOrderedObject)},
1.301 - {CC"putOrderedInt", CC"("OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)},
1.302 - {CC"putOrderedLong", CC"("OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)},
1.303 - {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)},
1.304 - {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)}
1.305 + {CC "defineClass", CC "(" DC0_Args ")" CLS, FN_PTR(Unsafe_DefineClass0)},
1.306 + {CC "defineClass", CC "(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)},
1.307 + {CC "allocateInstance", CC "(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
1.308 + {CC "monitorEnter", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)},
1.309 + {CC "monitorExit", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)},
1.310 + {CC "tryMonitorEnter", CC "(" OBJ ")Z", FN_PTR(Unsafe_TryMonitorEnter)},
1.311 + {CC "throwException", CC "(" THR ")V", FN_PTR(Unsafe_ThrowException)},
1.312 + {CC "compareAndSwapObject", CC "(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
1.313 + {CC "compareAndSwapInt", CC "(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
1.314 + {CC "compareAndSwapLong", CC "(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
1.315 + {CC "putOrderedObject", CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetOrderedObject)},
1.316 + {CC "putOrderedInt", CC "(" OBJ "JI)V", FN_PTR(Unsafe_SetOrderedInt)},
1.317 + {CC "putOrderedLong", CC "(" OBJ "JJ)V", FN_PTR(Unsafe_SetOrderedLong)},
1.318 + {CC "park", CC "(ZJ)V", FN_PTR(Unsafe_Park)},
1.319 + {CC "unpark", CC "(" OBJ ")V", FN_PTR(Unsafe_Unpark)}
1.320 };
1.321
1.322 // These are the methods for 1.8.0
1.323 static JNINativeMethod methods_18[] = {
1.324 - {CC"getObject", CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObject)},
1.325 - {CC"putObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObject)},
1.326 - {CC"getObjectVolatile",CC"("OBJ"J)"OBJ"", FN_PTR(Unsafe_GetObjectVolatile)},
1.327 - {CC"putObjectVolatile",CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetObjectVolatile)},
1.328 + {CC "getObject", CC "(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObject)},
1.329 + {CC "putObject", CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObject)},
1.330 + {CC "getObjectVolatile",CC "(" OBJ "J)" OBJ "", FN_PTR(Unsafe_GetObjectVolatile)},
1.331 + {CC "putObjectVolatile",CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetObjectVolatile)},
1.332
1.333 DECLARE_GETSETOOP(Boolean, Z),
1.334 DECLARE_GETSETOOP(Byte, B),
1.335 @@ -1615,71 +1615,71 @@
1.336 DECLARE_GETSETNATIVE(Float, F),
1.337 DECLARE_GETSETNATIVE(Double, D),
1.338
1.339 - {CC"getAddress", CC"("ADR")"ADR, FN_PTR(Unsafe_GetNativeAddress)},
1.340 - {CC"putAddress", CC"("ADR""ADR")V", FN_PTR(Unsafe_SetNativeAddress)},
1.341 + {CC "getAddress", CC "(" ADR ")" ADR, FN_PTR(Unsafe_GetNativeAddress)},
1.342 + {CC "putAddress", CC "(" ADR "" ADR ")V", FN_PTR(Unsafe_SetNativeAddress)},
1.343
1.344 - {CC"allocateMemory", CC"(J)"ADR, FN_PTR(Unsafe_AllocateMemory)},
1.345 - {CC"reallocateMemory", CC"("ADR"J)"ADR, FN_PTR(Unsafe_ReallocateMemory)},
1.346 - {CC"freeMemory", CC"("ADR")V", FN_PTR(Unsafe_FreeMemory)},
1.347 + {CC "allocateMemory", CC "(J)" ADR, FN_PTR(Unsafe_AllocateMemory)},
1.348 + {CC "reallocateMemory", CC "(" ADR "J)" ADR, FN_PTR(Unsafe_ReallocateMemory)},
1.349 + {CC "freeMemory", CC "(" ADR ")V", FN_PTR(Unsafe_FreeMemory)},
1.350
1.351 - {CC"objectFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_ObjectFieldOffset)},
1.352 - {CC"staticFieldOffset", CC"("FLD")J", FN_PTR(Unsafe_StaticFieldOffset)},
1.353 - {CC"staticFieldBase", CC"("FLD")"OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
1.354 - {CC"ensureClassInitialized",CC"("CLS")V", FN_PTR(Unsafe_EnsureClassInitialized)},
1.355 - {CC"arrayBaseOffset", CC"("CLS")I", FN_PTR(Unsafe_ArrayBaseOffset)},
1.356 - {CC"arrayIndexScale", CC"("CLS")I", FN_PTR(Unsafe_ArrayIndexScale)},
1.357 - {CC"addressSize", CC"()I", FN_PTR(Unsafe_AddressSize)},
1.358 - {CC"pageSize", CC"()I", FN_PTR(Unsafe_PageSize)},
1.359 + {CC "objectFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_ObjectFieldOffset)},
1.360 + {CC "staticFieldOffset", CC "(" FLD ")J", FN_PTR(Unsafe_StaticFieldOffset)},
1.361 + {CC "staticFieldBase", CC "(" FLD ")" OBJ, FN_PTR(Unsafe_StaticFieldBaseFromField)},
1.362 + {CC "ensureClassInitialized",CC "(" CLS ")V", FN_PTR(Unsafe_EnsureClassInitialized)},
1.363 + {CC "arrayBaseOffset", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayBaseOffset)},
1.364 + {CC "arrayIndexScale", CC "(" CLS ")I", FN_PTR(Unsafe_ArrayIndexScale)},
1.365 + {CC "addressSize", CC "()I", FN_PTR(Unsafe_AddressSize)},
1.366 + {CC "pageSize", CC "()I", FN_PTR(Unsafe_PageSize)},
1.367
1.368 - {CC"defineClass", CC"("DC_Args")"CLS, FN_PTR(Unsafe_DefineClass)},
1.369 - {CC"allocateInstance", CC"("CLS")"OBJ, FN_PTR(Unsafe_AllocateInstance)},
1.370 - {CC"monitorEnter", CC"("OBJ")V", FN_PTR(Unsafe_MonitorEnter)},
1.371 - {CC"monitorExit", CC"("OBJ")V", FN_PTR(Unsafe_MonitorExit)},
1.372 - {CC"tryMonitorEnter", CC"("OBJ")Z", FN_PTR(Unsafe_TryMonitorEnter)},
1.373 - {CC"throwException", CC"("THR")V", FN_PTR(Unsafe_ThrowException)},
1.374 - {CC"compareAndSwapObject", CC"("OBJ"J"OBJ""OBJ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
1.375 - {CC"compareAndSwapInt", CC"("OBJ"J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
1.376 - {CC"compareAndSwapLong", CC"("OBJ"J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
1.377 - {CC"putOrderedObject", CC"("OBJ"J"OBJ")V", FN_PTR(Unsafe_SetOrderedObject)},
1.378 - {CC"putOrderedInt", CC"("OBJ"JI)V", FN_PTR(Unsafe_SetOrderedInt)},
1.379 - {CC"putOrderedLong", CC"("OBJ"JJ)V", FN_PTR(Unsafe_SetOrderedLong)},
1.380 - {CC"park", CC"(ZJ)V", FN_PTR(Unsafe_Park)},
1.381 - {CC"unpark", CC"("OBJ")V", FN_PTR(Unsafe_Unpark)}
1.382 + {CC "defineClass", CC "(" DC_Args ")" CLS, FN_PTR(Unsafe_DefineClass)},
1.383 + {CC "allocateInstance", CC "(" CLS ")" OBJ, FN_PTR(Unsafe_AllocateInstance)},
1.384 + {CC "monitorEnter", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorEnter)},
1.385 + {CC "monitorExit", CC "(" OBJ ")V", FN_PTR(Unsafe_MonitorExit)},
1.386 + {CC "tryMonitorEnter", CC "(" OBJ ")Z", FN_PTR(Unsafe_TryMonitorEnter)},
1.387 + {CC "throwException", CC "(" THR ")V", FN_PTR(Unsafe_ThrowException)},
1.388 + {CC "compareAndSwapObject", CC "(" OBJ "J" OBJ "" OBJ ")Z", FN_PTR(Unsafe_CompareAndSwapObject)},
1.389 + {CC "compareAndSwapInt", CC "(" OBJ "J""I""I"")Z", FN_PTR(Unsafe_CompareAndSwapInt)},
1.390 + {CC "compareAndSwapLong", CC "(" OBJ "J""J""J"")Z", FN_PTR(Unsafe_CompareAndSwapLong)},
1.391 + {CC "putOrderedObject", CC "(" OBJ "J" OBJ ")V", FN_PTR(Unsafe_SetOrderedObject)},
1.392 + {CC "putOrderedInt", CC "(" OBJ "JI)V", FN_PTR(Unsafe_SetOrderedInt)},
1.393 + {CC "putOrderedLong", CC "(" OBJ "JJ)V", FN_PTR(Unsafe_SetOrderedLong)},
1.394 + {CC "park", CC "(ZJ)V", FN_PTR(Unsafe_Park)},
1.395 + {CC "unpark", CC "(" OBJ ")V", FN_PTR(Unsafe_Unpark)}
1.396 };
1.397
1.398 JNINativeMethod loadavg_method[] = {
1.399 - {CC"getLoadAverage", CC"([DI)I", FN_PTR(Unsafe_Loadavg)}
1.400 + {CC "getLoadAverage", CC "([DI)I", FN_PTR(Unsafe_Loadavg)}
1.401 };
1.402
1.403 JNINativeMethod prefetch_methods[] = {
1.404 - {CC"prefetchRead", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)},
1.405 - {CC"prefetchWrite", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)},
1.406 - {CC"prefetchReadStatic", CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchRead)},
1.407 - {CC"prefetchWriteStatic",CC"("OBJ"J)V", FN_PTR(Unsafe_PrefetchWrite)}
1.408 + {CC "prefetchRead", CC "(" OBJ "J)V", FN_PTR(Unsafe_PrefetchRead)},
1.409 + {CC "prefetchWrite", CC "(" OBJ "J)V", FN_PTR(Unsafe_PrefetchWrite)},
1.410 + {CC "prefetchReadStatic", CC "(" OBJ "J)V", FN_PTR(Unsafe_PrefetchRead)},
1.411 + {CC "prefetchWriteStatic",CC "(" OBJ "J)V", FN_PTR(Unsafe_PrefetchWrite)}
1.412 };
1.413
1.414 JNINativeMethod memcopy_methods_17[] = {
1.415 - {CC"copyMemory", CC"("OBJ"J"OBJ"JJ)V", FN_PTR(Unsafe_CopyMemory2)},
1.416 - {CC"setMemory", CC"("OBJ"JJB)V", FN_PTR(Unsafe_SetMemory2)}
1.417 + {CC "copyMemory", CC "(" OBJ "J" OBJ "JJ)V", FN_PTR(Unsafe_CopyMemory2)},
1.418 + {CC "setMemory", CC "(" OBJ "JJB)V", FN_PTR(Unsafe_SetMemory2)}
1.419 };
1.420
1.421 JNINativeMethod memcopy_methods_15[] = {
1.422 - {CC"setMemory", CC"("ADR"JB)V", FN_PTR(Unsafe_SetMemory)},
1.423 - {CC"copyMemory", CC"("ADR ADR"J)V", FN_PTR(Unsafe_CopyMemory)}
1.424 + {CC "setMemory", CC "(" ADR "JB)V", FN_PTR(Unsafe_SetMemory)},
1.425 + {CC "copyMemory", CC "(" ADR ADR "J)V", FN_PTR(Unsafe_CopyMemory)}
1.426 };
1.427
1.428 JNINativeMethod anonk_methods[] = {
1.429 - {CC"defineAnonymousClass", CC"("DAC_Args")"CLS, FN_PTR(Unsafe_DefineAnonymousClass)},
1.430 + {CC "defineAnonymousClass", CC "(" DAC_Args ")" CLS, FN_PTR(Unsafe_DefineAnonymousClass)},
1.431 };
1.432
1.433 JNINativeMethod lform_methods[] = {
1.434 - {CC"shouldBeInitialized",CC"("CLS")Z", FN_PTR(Unsafe_ShouldBeInitialized)},
1.435 + {CC "shouldBeInitialized",CC "(" CLS ")Z", FN_PTR(Unsafe_ShouldBeInitialized)},
1.436 };
1.437
1.438 JNINativeMethod fence_methods[] = {
1.439 - {CC"loadFence", CC"()V", FN_PTR(Unsafe_LoadFence)},
1.440 - {CC"storeFence", CC"()V", FN_PTR(Unsafe_StoreFence)},
1.441 - {CC"fullFence", CC"()V", FN_PTR(Unsafe_FullFence)},
1.442 + {CC "loadFence", CC "()V", FN_PTR(Unsafe_LoadFence)},
1.443 + {CC "storeFence", CC "()V", FN_PTR(Unsafe_StoreFence)},
1.444 + {CC "fullFence", CC "()V", FN_PTR(Unsafe_FullFence)},
1.445 };
1.446
1.447 #undef CC
