[vmkit-commits] [vmkit] r109011 - in /vmkit/trunk: include/debug.h mmtk/mmtk-alloc/Selected.cpp mmtk/mmtk-j3/ObjectModel.cpp mmtk/mmtk-j3/Scanning.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Wed Jul 21 08:05:01 2010
New Revision: 109011

URL: http://llvm.org/viewvc/llvm-project?rev=109011&view=rev
Log:
Add a macro for __attribute__ ((always_inline))


Modified:
    vmkit/trunk/include/debug.h
    vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
    vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp
    vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp

Modified: vmkit/trunk/include/debug.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/debug.h?rev=109011&r1=109010&r2=109011&view=diff
==============================================================================
--- vmkit/trunk/include/debug.h (original)
+++ vmkit/trunk/include/debug.h Wed Jul 21 08:05:01 2010
@@ -74,4 +74,7 @@
 #define ASSERT(cond) {  \
   if (!cond) ABORT(); } \
 
+#undef ALWAYS_INLINE
+#define ALWAYS_INLINE __attribute__ ((always_inline))
+
 #endif

Modified: vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp?rev=109011&r1=109010&r2=109011&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp Wed Jul 21 08:05:01 2010
@@ -15,41 +15,39 @@
 #include <sys/mman.h>
 #include <set>
 
+#include "debug.h"
+
 using namespace mvm;
 
 int Collector::verbose = 0;
-extern "C" void Java_org_j3_mmtk_Collection_triggerCollection__I(
-    uintptr_t, int32_t) __attribute__ ((always_inline));
+extern "C" void Java_org_j3_mmtk_Collection_triggerCollection__I(uintptr_t, int32_t) ALWAYS_INLINE;
 
-extern "C" intptr_t JnJVM_org_j3_bindings_Bindings_allocateMutator__I(
-    int32_t) __attribute__ ((always_inline));
-extern "C" void JnJVM_org_j3_bindings_Bindings_freeMutator__Lorg_mmtk_plan_MutatorContext_2(
-    intptr_t) __attribute__ ((always_inline));
-extern "C" void JnJVM_org_j3_bindings_Bindings_boot__Lorg_vmmagic_unboxed_Extent_2Lorg_vmmagic_unboxed_Extent_2(
-    intptr_t, intptr_t) __attribute__ ((always_inline));
+extern "C" intptr_t JnJVM_org_j3_bindings_Bindings_allocateMutator__I(int32_t) ALWAYS_INLINE;
+extern "C" void JnJVM_org_j3_bindings_Bindings_freeMutator__Lorg_mmtk_plan_MutatorContext_2(intptr_t) ALWAYS_INLINE;
+extern "C" void JnJVM_org_j3_bindings_Bindings_boot__Lorg_vmmagic_unboxed_Extent_2Lorg_vmmagic_unboxed_Extent_2(intptr_t, intptr_t) ALWAYS_INLINE;
 
 extern "C" void JnJVM_org_j3_bindings_Bindings_processEdge__Lorg_mmtk_plan_TransitiveClosure_2Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Address_2(
-    uintptr_t closure, void* source, void* slot) __attribute__ ((always_inline));
+    uintptr_t closure, void* source, void* slot) ALWAYS_INLINE;
 
 extern "C" void JnJVM_org_j3_bindings_Bindings_reportDelayedRootEdge__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_Address_2(
-    uintptr_t TraceLocal, void** slot) __attribute__ ((always_inline));
+    uintptr_t TraceLocal, void** slot) ALWAYS_INLINE;
 extern "C" void JnJVM_org_j3_bindings_Bindings_processRootEdge__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_Address_2Z(
-    uintptr_t TraceLocal, void* slot, uint8_t untraced) __attribute__ ((always_inline));
+    uintptr_t TraceLocal, void* slot, uint8_t untraced) ALWAYS_INLINE;
 extern "C" gc* JnJVM_org_j3_bindings_Bindings_retainForFinalize__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(
-    uintptr_t TraceLocal, void* obj) __attribute__ ((always_inline));
+    uintptr_t TraceLocal, void* obj) ALWAYS_INLINE;
 extern "C" gc* JnJVM_org_j3_bindings_Bindings_retainReferent__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(
-    uintptr_t TraceLocal, void* obj) __attribute__ ((always_inline));
+    uintptr_t TraceLocal, void* obj) ALWAYS_INLINE;
 extern "C" gc* JnJVM_org_j3_bindings_Bindings_getForwardedReference__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(
-    uintptr_t TraceLocal, void* obj) __attribute__ ((always_inline));
+    uintptr_t TraceLocal, void* obj) ALWAYS_INLINE;
 extern "C" gc* JnJVM_org_j3_bindings_Bindings_getForwardedReferent__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(
-    uintptr_t TraceLocal, void* obj) __attribute__ ((always_inline));
+    uintptr_t TraceLocal, void* obj) ALWAYS_INLINE;
 extern "C" gc* JnJVM_org_j3_bindings_Bindings_getForwardedFinalizable__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(
-    uintptr_t TraceLocal, void* obj) __attribute__ ((always_inline));
+    uintptr_t TraceLocal, void* obj) ALWAYS_INLINE;
 extern "C" uint8_t JnJVM_org_j3_bindings_Bindings_isLive__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(
-    uintptr_t TraceLocal, void* obj) __attribute__ ((always_inline));
+    uintptr_t TraceLocal, void* obj) ALWAYS_INLINE;
 
 extern "C" void* JnJVM_org_j3_bindings_Bindings_gcmalloc__ILorg_vmmagic_unboxed_ObjectReference_2(
-    int sz, void* VT) __attribute__ ((always_inline));
+    int sz, void* VT) ALWAYS_INLINE;
 
 extern "C" void* gcmalloc(uint32_t sz, void* VT) {
   sz = llvm::RoundUpToAlignment(sz, sizeof(void*));

Modified: vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp?rev=109011&r1=109010&r2=109011&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp Wed Jul 21 08:05:01 2010
@@ -75,7 +75,7 @@
 }
 
 extern "C" void Java_org_j3_bindings_Bindings_memcpy__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_ObjectReference_2I(
-    void* res, void* src, int size) __attribute__ ((always_inline));
+    void* res, void* src, int size) ALWAYS_INLINE;
 
 extern "C" void Java_org_j3_bindings_Bindings_memcpy__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_ObjectReference_2I(
     void* res, void* src, int size) {
@@ -83,10 +83,10 @@
 }
 
 extern "C" uintptr_t JnJVM_org_j3_bindings_Bindings_copy__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_ObjectReference_2II(
-    JavaObject* obj, VirtualTable* VT, int size, int allocator) __attribute__ ((always_inline));
+    JavaObject* obj, VirtualTable* VT, int size, int allocator) ALWAYS_INLINE;
 
 extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_copy__Lorg_vmmagic_unboxed_ObjectReference_2I (
-    JavaObject* OM, JavaObject* src, int allocator) __attribute__ ((always_inline));
+    JavaObject* OM, JavaObject* src, int allocator) ALWAYS_INLINE;
 
 extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_copy__Lorg_vmmagic_unboxed_ObjectReference_2I (
     JavaObject* OM, JavaObject* src, int allocator) {

Modified: vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp?rev=109011&r1=109010&r2=109011&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp Wed Jul 21 08:05:01 2010
@@ -50,7 +50,7 @@
   // Nothing to do.
 }
 
-extern "C" void Java_org_j3_mmtk_Scanning_specializedScanObject__ILorg_mmtk_plan_TransitiveClosure_2Lorg_vmmagic_unboxed_ObjectReference_2 (JavaObject* Scanning, uint32_t id, JavaObject* TC, JavaObject* obj) __attribute__ ((always_inline));
+extern "C" void Java_org_j3_mmtk_Scanning_specializedScanObject__ILorg_mmtk_plan_TransitiveClosure_2Lorg_vmmagic_unboxed_ObjectReference_2 (JavaObject* Scanning, uint32_t id, JavaObject* TC, JavaObject* obj) ALWAYS_INLINE;
 
 extern "C" void Java_org_j3_mmtk_Scanning_specializedScanObject__ILorg_mmtk_plan_TransitiveClosure_2Lorg_vmmagic_unboxed_ObjectReference_2 (JavaObject* Scanning, uint32_t id, JavaObject* TC, JavaObject* obj) {
   assert(obj && "No object to trace");