儲存庫 vbox 的更動 18142

時間撮記:

2009-3-23 下午02:56:21 (16 年 以前)

作者:

vboxsync

訊息:

crOpenGL rollback r44835 & r44836 as it's not compiling on 64bit

位置:

trunk/src/VBox/Additions/common/crOpenGL

檔案:

• Linux_i386_exports.py (修改) (3 筆差異)
• windows_i386_exports.py (修改) (3 筆差異)

trunk/src/VBox/Additions/common/crOpenGL/Linux_i386_exports.py

@@ -26 +26 @@
     print ""
 
-    print"""
-    %ifdef RT_ARCH_AMD64
-     %define PTR_PRE qword
-     %define PTR_CB  8
-    %else
-     %define PTR_PRE dword
-     %define PTR_CB  4
-    %endif
-    """
-
     keys = apiutil.GetDispatchedFunctions(sys.argv[1]+"/APIspec.txt")
 
@@ -44 +34 @@
 
         print "BEGINPROC_EXPORTED gl%s" % func_name
-        print "\tjmp \t[PTR_PRE glim + PTR_CB*%d]" % index
+        print "%ifdef RT_ARCH_AMD64"
+        print "\tmov \trax, qword glim+%d" % (8*index)
+        print "\tjmp \t[rax]"
+        print "%else ; X86"
+        print "\tmov \teax, dword glim+%d" % (4*index)
+        print "\tjmp \t[eax]"
+        print "%endif"
         print "ENDPROC gl%s" % func_name
         print ""
@@ -69 +65 @@
             index = keys.index(alias)
             print "BEGINPROC_EXPORTED gl%s" % func_name
-            print "\tjmp \t[PTR_PRE glim + PTR_CB*%d]" % index
+            print "%ifdef RT_ARCH_AMD64"
+            print "\tmov \trax, qword glim+%d" % (8*index)
+            print "\tjmp \t[rax]"
+            print "%else ; X86"
+            print "\tmov \teax, dword glim+%d" % (4*index)
+            print "\tjmp \t[eax]"
+            print "%endif"
             print "ENDPROC gl%s" % func_name
             print ""

trunk/src/VBox/Additions/common/crOpenGL/windows_i386_exports.py

@@ -22 +22 @@
         print ""
 
-    print"""
-    %ifdef RT_ARCH_AMD64
-     %define PTR_PRE qword
-     %define PTR_CB  8
-    %else
-     %define PTR_PRE dword
-     %define PTR_CB  4
-    %endif
-    """
-
         # Get sorted list of dispatched functions.
         # The order is very important - it must match cr_opcodes.h
@@ -44 +34 @@
                 print "BEGINPROC_EXPORTED cr_gl%s" % func_name
                 print "%ifdef RT_ARCH_AMD64"
-        print "\tjmp \t[PTR_PRE glim + PTR_CB*%d]" % index
+                print "\tmov \trax, qword glim+%d" % (8*index)
+                print "\tjmp \t[rax]"
                 print "%else ; X86"
-        print "\tjmp \t[PTR_PRE _glim + PTR_CB*%d]" % index
+                print "\tmov \teax, dword _glim+%d" % (4*index)
+                print "\tjmp \t[eax]"
                 print "%endif"
                 print "ENDPROC cr_gl%s" % func_name
@@ -72 +64 @@
                         index = keys.index(alias)
                         print "BEGINPROC_EXPORTED cr_gl%s" % func_name
-            print "\tjmp \t[PTR_PRE glim + PTR_CB*%d]" % index
+                        print "%ifdef RT_ARCH_AMD64"
+                        print "\tmov \trax, qword glim+%d" % (8*index)
+                        print "\tjmp \t[rax]"
                         print "%else ; X86"
-            print "\tjmp \t[PTR_PRE _glim + PTR_CB*%d]" % index
+                        print "\tmov \teax, dword _glim+%d" % (4*index)
+                        print "\tjmp \t[eax]"
                         print "%endif"
                         print "ENDPROC cr_gl%s" % func_name