[vmkit-commits] [vmkit] r67197 - in /vmkit/trunk/lib/Mvm: Compiler/LLVMAssembly.ll Compiler/LLVMAssembly64.ll Compiler/Makefile Makefile Runtime/LLVMAssembly.ll Runtime/LLVMAssembly64.ll Runtime/Makefile

[Nicolas Geoffray]

Author: geoffray
Date: Wed Mar 18 06:02:41 2009
New Revision: 67197

URL: http://llvm.org/viewvc/llvm-project?rev=67197&view=rev
Log:
Put back the llvm-generated cmp_and_swap functions into
the Runtime instead of the Compiler.


Added:
    vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly.ll
      - copied unchanged from r67196, vmkit/trunk/lib/Mvm/Compiler/LLVMAssembly.ll
    vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly64.ll
      - copied unchanged from r67196, vmkit/trunk/lib/Mvm/Compiler/LLVMAssembly64.ll
Removed:
    vmkit/trunk/lib/Mvm/Compiler/LLVMAssembly.ll
    vmkit/trunk/lib/Mvm/Compiler/LLVMAssembly64.ll
Modified:
    vmkit/trunk/lib/Mvm/Compiler/Makefile
    vmkit/trunk/lib/Mvm/Makefile
    vmkit/trunk/lib/Mvm/Runtime/Makefile

Removed: vmkit/trunk/lib/Mvm/Compiler/LLVMAssembly.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/LLVMAssembly.ll?rev=67196&view=auto

==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/LLVMAssembly.ll (original)
+++ vmkit/trunk/lib/Mvm/Compiler/LLVMAssembly.ll (removed)
@@ -1,31 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Atomic ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-declare i8  @llvm.atomic.cmp.swap.i8.p0i8(i8*, i8, i8) nounwind
-declare i16 @llvm.atomic.cmp.swap.i16.p0i16(i16*, i16, i16) nounwind
-declare i32 @llvm.atomic.cmp.swap.i32.p0i32(i32*, i32, i32) nounwind
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;Helper functions for gcc < 4.2 ;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-define i8 @llvm_atomic_cmp_swap_i8(i8* %ptr, i8 %cmp, i8 %swap) 
-nounwind {
-  %A = call i8 @llvm.atomic.cmp.swap.i8.p0i8( i8* %ptr, i8 %cmp, i8 %swap)
-  ret i8 %A
-}
-
-define i16 @llvm_atomic_cmp_swap_i16(i16* %ptr, i16 %cmp, i16 %swap)
-nounwind {
-  %A = call i16 @llvm.atomic.cmp.swap.i16.p0i16( i16* %ptr, i16 %cmp, i16 %swap)
-  ret i16 %A
-}
-
-define i32 @llvm_atomic_cmp_swap_i32(i32* %ptr, i32 %cmp, i32 %swap)
-nounwind {
-  %A = call i32 @llvm.atomic.cmp.swap.i32.p0i32(i32* %ptr, i32 %cmp, i32 %swap)
-  ret i32 %A
-}
-
-

Removed: vmkit/trunk/lib/Mvm/Compiler/LLVMAssembly64.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/LLVMAssembly64.ll?rev=67196&view=auto

==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/LLVMAssembly64.ll (original)
+++ vmkit/trunk/lib/Mvm/Compiler/LLVMAssembly64.ll (removed)
@@ -1,7 +0,0 @@
-declare i64 @llvm.atomic.cmp.swap.i64.p0i64(i64*, i64, i64) nounwind
-
-define i64 @llvm_atomic_cmp_swap_i64(i64* %ptr, i64 %cmp, i64 %swap)
-nounwind {
-  %A = call i64 @llvm.atomic.cmp.swap.i64.p0i64( i64* %ptr, i64 %cmp, i64 %swap)
-  ret i64 %A
-}

Modified: vmkit/trunk/lib/Mvm/Compiler/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/Makefile?rev=67197&r1=67196&r2=67197&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/Makefile (original)
+++ vmkit/trunk/lib/Mvm/Compiler/Makefile Wed Mar 18 06:02:41 2009
@@ -12,14 +12,6 @@
 
 LIBRARYNAME = MvmCompiler
 VMKIT_RUNTIME = $(PROJ_SRC_DIR)/LLVMRuntime.ll
-VMKIT_ASSEMBLY = $(PROJ_SRC_DIR)/LLVMAssembly.ll
-BUILT_SOURCES = LLVMRuntime.inc LLVMAssembly.s
-
-ifeq ($(WITH_64), 1)
-  VMKIT_ASSEMBLY += $(PROJ_SRC_DIR)/LLVMAssembly64.ll
-endif
-
-
-SOURCES = LLVMAssembly.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))
+BUILT_SOURCES = LLVMRuntime.inc
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/lib/Mvm/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Makefile?rev=67197&r1=67196&r2=67197&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Makefile (original)
+++ vmkit/trunk/lib/Mvm/Makefile Wed Mar 18 06:02:41 2009
@@ -12,6 +12,6 @@
 
 EXTRA_DIST = BoehmGC GCMmap2
 
-DIRS = Allocator CommonThread $(GCLIB) Runtime
+DIRS = Allocator CommonThread $(GCLIB) Runtime Compiler
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/lib/Mvm/Runtime/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/Makefile?rev=67197&r1=67196&r2=67197&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/Makefile (original)
+++ vmkit/trunk/lib/Mvm/Runtime/Makefile Wed Mar 18 06:02:41 2009
@@ -11,5 +11,14 @@
 include $(LEVEL)/Makefile.config
 
 LIBRARYNAME = Mvm
+VMKIT_ASSEMBLY = $(PROJ_SRC_DIR)/LLVMAssembly.ll
+BUILT_SOURCES = LLVMAssembly.s
+
+ifeq ($(WITH_64), 1)
+  VMKIT_ASSEMBLY += $(PROJ_SRC_DIR)/LLVMAssembly64.ll
+endif
+
+
+SOURCES = LLVMAssembly.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))
 
 include $(LEVEL)/Makefile.common