summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2013-05-15 22:05:01 +1000
committerBen Skeggs <bskeggs@redhat.com>2013-05-15 22:06:16 +1000
commitbf72ae1f6574c540f0afc2d7845d41df43507a8f (patch)
tree00f0730fcdbd4fccb826c6c1441cddd897744f32
parent41cc2f24c43d2656ac722f594aaebad93e37dfec (diff)
downloadxorg-driver-xf86-video-nouveau-bf72ae1f6574c540f0afc2d7845d41df43507a8f.tar.gz
nve0: envyas isn't overly clever.. avoid short-form instructions
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--src/shader/exac8nve0.fp8
-rw-r--r--src/shader/exac8nve0.fpc12
-rw-r--r--src/shader/exacanve0.fp2
-rw-r--r--src/shader/exacanve0.fpc3
-rw-r--r--src/shader/exacmnve0.fp2
-rw-r--r--src/shader/exacmnve0.fpc3
-rw-r--r--src/shader/exas8nve0.fp8
-rw-r--r--src/shader/exas8nve0.fpc12
-rw-r--r--src/shader/exasanve0.fp2
-rw-r--r--src/shader/exasanve0.fpc3
-rw-r--r--src/shader/exascnve0.fp2
-rw-r--r--src/shader/exascnve0.fpc3
-rw-r--r--src/shader/videonve0.fp2
-rw-r--r--src/shader/videonve0.fpc3
-rw-r--r--src/shader/xfrm2nve0.vp2
-rw-r--r--src/shader/xfrm2nve0.vpc3
16 files changed, 42 insertions, 28 deletions
diff --git a/src/shader/exac8nve0.fp b/src/shader/exac8nve0.fp
index 55cdde2..f4b4e82 100644
--- a/src/shader/exac8nve0.fp
+++ b/src/shader/exac8nve0.fp
@@ -35,8 +35,8 @@ interp mul f32 $r2 a[0x80] $r0 0x0
tex t lauto live dfp #:#:#:$r0 t2d $t0 $s0 $r2:$r3 ()
texbar 0x0
mul ftz rn f32 $r3 $r0 $r1
-mov b32 $r2 $r3
-mov b32 $r1 $r3
-mov b32 $r0 $r3
-exit
+long mov b32 $r2 $r3
+long mov b32 $r1 $r3
+long mov b32 $r0 $r3
+long exit
#endif
diff --git a/src/shader/exac8nve0.fpc b/src/shader/exac8nve0.fpc
index c7fc3bd..9e5e741 100644
--- a/src/shader/exac8nve0.fpc
+++ b/src/shader/exac8nve0.fpc
@@ -18,7 +18,11 @@
0xf0000000,
0x0400dc40,
0x58000000,
-0x00309c28,
-0x00305c28,
-0x00301c28,
-0x88001dff,
+0x0c009de4,
+0x28000000,
+0x0c005de4,
+0x28000000,
+0x0c001de4,
+0x28000000,
+0x00001de7,
+0x80000000,
diff --git a/src/shader/exacanve0.fp b/src/shader/exacanve0.fp
index dc54771..edeb717 100644
--- a/src/shader/exacanve0.fp
+++ b/src/shader/exacanve0.fp
@@ -39,5 +39,5 @@ mul ftz rn f32 $r3 $r3 $r7
mul ftz rn f32 $r2 $r2 $r6
mul ftz rn f32 $r1 $r1 $r5
mul ftz rn f32 $r0 $r0 $r4
-exit
+long exit
#endif
diff --git a/src/shader/exacanve0.fpc b/src/shader/exacanve0.fpc
index 52a736d..a8320f0 100644
--- a/src/shader/exacanve0.fpc
+++ b/src/shader/exacanve0.fpc
@@ -26,4 +26,5 @@
0x58000000,
0x10001c40,
0x58000000,
-0x88001dff,
+0x00001de7,
+0x80000000,
diff --git a/src/shader/exacmnve0.fp b/src/shader/exacmnve0.fp
index 5e0edfe..09d22c1 100644
--- a/src/shader/exacmnve0.fp
+++ b/src/shader/exacmnve0.fp
@@ -39,5 +39,5 @@ mul ftz rn f32 $r3 $r3 $r4
mul ftz rn f32 $r2 $r2 $r4
mul ftz rn f32 $r1 $r1 $r4
mul ftz rn f32 $r0 $r0 $r4
-exit
+long exit
#endif
diff --git a/src/shader/exacmnve0.fpc b/src/shader/exacmnve0.fpc
index 15694a0..5c2d4bf 100644
--- a/src/shader/exacmnve0.fpc
+++ b/src/shader/exacmnve0.fpc
@@ -26,4 +26,5 @@
0x58000000,
0x10001c40,
0x58000000,
-0x88001dff,
+0x00001de7,
+0x80000000,
diff --git a/src/shader/exas8nve0.fp b/src/shader/exas8nve0.fp
index 9f96236..8626d9c 100644
--- a/src/shader/exas8nve0.fp
+++ b/src/shader/exas8nve0.fp
@@ -31,8 +31,8 @@ interp mul f32 $r1 a[0x84] $r0 0x0
interp mul f32 $r0 a[0x80] $r0 0x0
tex t lauto live dfp #:#:#:$r0 t2d $t0 $s0 $r0:$r1 ()
texbar 0x0
-mov b32 $r3 $r0
-mov b32 $r2 $r0
-mov b32 $r1 $r0
-exit
+long mov b32 $r3 $r0
+long mov b32 $r2 $r0
+long mov b32 $r1 $r0
+long exit
#endif
diff --git a/src/shader/exas8nve0.fpc b/src/shader/exas8nve0.fpc
index 2e487f5..ed4793c 100644
--- a/src/shader/exas8nve0.fpc
+++ b/src/shader/exas8nve0.fpc
@@ -10,7 +10,11 @@
0x80120000,
0x00001de6,
0xf0000000,
-0x0000dc28,
-0x00009c28,
-0x00005c28,
-0x88001dff,
+0x0000dde4,
+0x28000000,
+0x00009de4,
+0x28000000,
+0x00005de4,
+0x28000000,
+0x00001de7,
+0x80000000,
diff --git a/src/shader/exasanve0.fp b/src/shader/exasanve0.fp
index 4ec257b..dea8eab 100644
--- a/src/shader/exasanve0.fp
+++ b/src/shader/exasanve0.fp
@@ -39,5 +39,5 @@ mul ftz rn f32 $r3 $r3 $r4
mul ftz rn f32 $r2 $r2 $r4
mul ftz rn f32 $r1 $r1 $r4
mul ftz rn f32 $r0 $r0 $r4
-exit
+long exit
#endif
diff --git a/src/shader/exasanve0.fpc b/src/shader/exasanve0.fpc
index 6a4d54b..efc701e 100644
--- a/src/shader/exasanve0.fpc
+++ b/src/shader/exasanve0.fpc
@@ -26,4 +26,5 @@
0x58000000,
0x10001c40,
0x58000000,
-0x88001dff,
+0x00001de7,
+0x80000000,
diff --git a/src/shader/exascnve0.fp b/src/shader/exascnve0.fp
index 5ec8496..355b894 100644
--- a/src/shader/exascnve0.fp
+++ b/src/shader/exascnve0.fp
@@ -31,5 +31,5 @@ interp mul f32 $r1 a[0x84] $r0 0x0
interp mul f32 $r0 a[0x80] $r0 0x0
tex t lauto live dfp $r0:$r1:$r2:$r3 t2d $t0 $s0 $r0:$r1 ()
texbar 0x0
-exit
+long exit
#endif
diff --git a/src/shader/exascnve0.fpc b/src/shader/exascnve0.fpc
index 5bbd150..24ca7bc 100644
--- a/src/shader/exascnve0.fpc
+++ b/src/shader/exascnve0.fpc
@@ -10,4 +10,5 @@
0x8013c000,
0x00001de6,
0xf0000000,
-0x88001dff,
+0x00001de7,
+0x80000000,
diff --git a/src/shader/videonve0.fp b/src/shader/videonve0.fp
index a6675c9..f761bd5 100644
--- a/src/shader/videonve0.fp
+++ b/src/shader/videonve0.fp
@@ -46,5 +46,5 @@ fma ftz rn f32 $r5 $r0 c0[0x18] $r5
fma ftz rn f32 $r0 $r1 c0[0x1c] $r3
fma ftz rn f32 $r2 $r1 c0[0x24] $r5
fma ftz rn f32 $r1 $r1 c0[0x20] $r4
-exit
+long exit
#endif
diff --git a/src/shader/videonve0.fpc b/src/shader/videonve0.fpc
index c4f1b09..4df540b 100644
--- a/src/shader/videonve0.fpc
+++ b/src/shader/videonve0.fpc
@@ -40,4 +40,5 @@
0x300a4000,
0x80105c40,
0x30084000,
-0x88001dff,
+0x00001de7,
+0x80000000,
diff --git a/src/shader/xfrm2nve0.vp b/src/shader/xfrm2nve0.vp
index 4e39f53..c949ea6 100644
--- a/src/shader/xfrm2nve0.vp
+++ b/src/shader/xfrm2nve0.vp
@@ -59,5 +59,5 @@ mul ftz rn f32 $r3 $r3 $r4
mul ftz rn f32 $r0 $r2 c0[0x50]
mul ftz rn f32 $r1 $r3 c0[0x54]
st b64 a[0x90] $r0:$r1 0x0 unk39
-exit
+long exit
#endif
diff --git a/src/shader/xfrm2nve0.vpc b/src/shader/xfrm2nve0.vpc
index c7aee0b..c3462b5 100644
--- a/src/shader/xfrm2nve0.vpc
+++ b/src/shader/xfrm2nve0.vpc
@@ -66,4 +66,5 @@
0x58004001,
0x03f01c26,
0x0a7e0090,
-0x88001dff,
+0x00001de7,
+0x80000000,