Module Name: xsrc
Committed By: macallan
Date: Thu Nov 12 21:40:05 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-sunffb/dist/src: VISmoveImage.s
Log Message:
reapply 64bit fixes
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-sunffb/dist/src/VISmoveImage.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/VISmoveImage.s
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/VISmoveImage.s:1.1.1.2 xsrc/external/mit/xf86-video-sunffb/dist/src/VISmoveImage.s:1.2
--- xsrc/external/mit/xf86-video-sunffb/dist/src/VISmoveImage.s:1.1.1.2 Mon Nov 9 05:32:23 2009
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/VISmoveImage.s Thu Nov 12 21:40:05 2009
@@ -77,6 +77,10 @@
*/
#if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
+
+ .register %g2, #scratch
+ .register %g3, #scratch
+
#define SMUL mulx
#define ICC xcc
#else
@@ -178,7 +182,11 @@
.globl VISmoveImageLR
.align 32
VISmoveImageLR:
- save %sp, -160, %sp ! Group 0
+#ifdef __arch64__
+ save %sp, -192, %sp ! Group 0
+#else
+ save %sp, -96, %sp ! Group 0
+#endif
0: rd %pc, %tmp3 ! Group 1
sub %src, %dst, %mode ! Group 7
brz,pn %h, return
@@ -779,7 +787,11 @@
sub %tmp3, %rightw, %curw
return: return %i7+8
+#if defined(__NetBSD__)
+ wr %g0, 4, %fprs
+#else
wr %g0, 0, %fprs
+#endif
narrowst:
and %leftw, 0x38, %tmp1
@@ -1142,7 +1154,11 @@
.globl VISmoveImageRL
.align 32
VISmoveImageRL:
- save %sp, -160, %sp ! Group 0
+#ifdef __arch64__
+ save %sp, -192, %sp ! Group 0
+#else
+ save %sp, -96, %sp ! Group 0
+#endif
0: rd %pc, %tmp3 ! Group 1
and %dst, 63, %leftw ! Group 7
mov 64, %tmp1
@@ -2174,7 +2190,11 @@
sub %curw, %rightw, %curw
rreturn:return %i7+8
+#if defined(__NetBSD__)
+ wr %g0, 4, %fprs
+#else
wr %g0, 0, %fprs
+#endif
narrowstr:
cmp %rightw, 64
