Re: pkg/37741: modular-xorg-server works almost out of the box on sparc64

[Pierre Pronchery <khorben%defora.org@localhost>]

The following reply was made to PR pkg/37741; it has been noted by GNATS.

From: Pierre Pronchery <khorben%defora.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/37741: modular-xorg-server works almost out of the box on
 sparc64
Date: Thu, 10 Jan 2008 20:23:58 +0100

 This is a multi-part message in MIME format.
 --------------050003020106010005040108
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 gnats-admin%netbsd.org@localhost wrote:
 > Thank you very much for your problem report.
 > It has the internal identification `pkg/37741'.
 > The individual assigned to look at your
 > report is: pkg-manager. 
 > 
 >> Category:       pkg
 >> Responsible:    pkg-manager
 >> Synopsis:       modular-xorg-server requires few patches to work on sparc64
 >> Arrival-Date:   Thu Jan 10 18:20:00 +0000 2008
 
 The most essential changes from xsrc are attached here.
 
 HTH,
 -- 
 khorben
 
 --------------050003020106010005040108
 Content-Type: text/plain;
  name="sunffb-1.1.0.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="sunffb-1.1.0.patch"
 
 diff -Naur xf86-video-sunffb-1.1.0.orig/src/VISmoveImage.s 
xf86-video-sunffb-1.1.0/src/VISmoveImage.s
 --- xf86-video-sunffb-1.1.0.orig/src/VISmoveImage.s    2004-04-23 
21:48:16.000000000 +0200
 +++ xf86-video-sunffb-1.1.0/src/VISmoveImage.s 2008-01-10 17:52:08.000000000 
+0100
 @@ -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
 +#ifdef __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
 diff -Naur xf86-video-sunffb-1.1.0.orig/src/ffb_asm.s 
xf86-video-sunffb-1.1.0/src/ffb_asm.s
 --- xf86-video-sunffb-1.1.0.orig/src/ffb_asm.s 2004-04-23 21:48:16.000000000 
+0200
 +++ xf86-video-sunffb-1.1.0/src/ffb_asm.s      2008-01-10 17:52:08.000000000 
+0100
 @@ -24,6 +24,9 @@
   */
  /* $XFree86$ */
  
 + .register %g2, #scratch
 + .register %g3, #scratch
 +
  /* Hardware register offsets */
  #define FFB_BY                0x0060
  #define FFB_DY                0x0068
 
 --------------050003020106010005040108--