regenerate SPARC assembly dispatch (bug 6484)

diff --git a/src/mesa/glapi/Makefile b/src/mesa/glapi/Makefile
index 1030e5e2c3bda7a3e88a39a6d37eb7a094b3bb92..4eba897e4bf306752b7059064eb374ac42c9de08 100644 (file)
--- a/src/mesa/glapi/Makefile
+++ b/src/mesa/glapi/Makefile
@@ -11,6 +11,7 @@ OUTPUTS = glprocs.h glapitemp.h glapioffsets.h glapitable.h dispatch.h \
        ../main/enums.c \
        ../x86/glapi_x86.S \
        ../x86-64/glapi_x86-64.S \
+       ../sparc/glapi_sparc.S \
        ../drivers/dri/common/extension_helper.h \
        ../../glx/x11/indirect.c \
        ../../glx/x11/indirect.h \
@@ -59,6 +60,10 @@ dispatch.h: $(COMMON) gl_table.py
 ../x86-64/glapi_x86-64.S: $(COMMON) gl_x86-64_asm.py
        $(PYTHON2) $(PYTHON_FLAGS) gl_x86-64_asm.py > ../x86-64/glapi_x86-64.S
 
+../sparc/glapi_sparc.S: $(COMMON) gl_SPARC_asm.py
+       $(PYTHON2) $(PYTHON_FLAGS) gl_SPARC_asm.py > ../sparc/glapi_sparc.S
+
+
 ../drivers/dri/common/extension_helper.h: $(COMMON) extension_helper.py
        $(PYTHON2) $(PYTHON_FLAGS) extension_helper.py > ../drivers/dri/common/extension_helper.h
 

diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 175a2819f738342ea7acf3cf2f59847b0811cf3f..692cfd60b75fd1d730092c846747e10b807362d6 100644 (file)
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -31,10 +31,10 @@
 #ifdef __arch64__
 #  define GL_STUB(fn,off)                              \
 fn:                                    \
-       sethi   %hi(0x00000000), %g4 ;                  \
-       sethi   %hi(0x00000000), %g1 ;                  \
-       or      %g4, %lo(0x00000000), %g4 ;             \
-       or      %g1, %lo(0x00000000), %g1 ;             \
+       sethi   %hi(0xDEADBEEF), %g4 ;                  \
+       sethi   %hi(0xDEADBEEF), %g1 ;                  \
+       or      %g4, %lo(0xDEADBEEF), %g4 ;             \
+       or      %g1, %lo(0xDEADBEEF), %g1 ;             \
        sllx    %g4, 32, %g4 ;                          \
        ldx     [%g1 + %g4], %g1 ;                      \
        sethi   %hi(8 * off), %g4 ;                     \
@@ -45,8 +45,8 @@ fn:                                   \
 #else
 #  define GL_STUB(fn,off)                              \
 fn:                                    \
-       sethi   %hi(0x00000000), %g1 ;                  \
-       ld      [%g1 + %lo(0x00000000)], %g1 ;          \
+       sethi   %hi(0xDEADBEEF), %g1 ;                  \
+       ld      [%g1 + %lo(0xDEADBEEF)], %g1 ;          \
        ld      [%g1 + (4 * off)], %g5 ;                \
        jmpl    %g5, %g0 ;                              \
        nop
@@ -881,6 +881,9 @@ __glapi_sparc_icache_flush: /* %o0 = insn_addr */
                .globl glStencilFuncSeparate ; .type glStencilFuncSeparate,#function
                .globl glStencilOpSeparate ; .type glStencilOpSeparate,#function
                .globl glStencilMaskSeparate ; .type glStencilMaskSeparate,#function
+               .globl glGetQueryObjecti64vEXT ; .type glGetQueryObjecti64vEXT,#function
+               .globl glGetQueryObjectui64vEXT ; .type glGetQueryObjectui64vEXT,#function
+               .globl glBlitFramebufferEXT ; .type glBlitFramebufferEXT,#function
                .globl _mesa_sparc_glapi_begin ; .type _mesa_sparc_glapi_begin,#function
 _mesa_sparc_glapi_begin:
 
@@ -1700,6 +1703,9 @@ _mesa_sparc_glapi_begin:
        GL_STUB(glStencilFuncSeparate, _gloffset_StencilFuncSeparate)
        GL_STUB(glStencilOpSeparate, _gloffset_StencilOpSeparate)
        GL_STUB(glStencilMaskSeparate, _gloffset_StencilMaskSeparate)
+       GL_STUB(glGetQueryObjecti64vEXT, _gloffset_GetQueryObjecti64vEXT)
+       GL_STUB(glGetQueryObjectui64vEXT, _gloffset_GetQueryObjectui64vEXT)
+       GL_STUB(glBlitFramebufferEXT, _gloffset_BlitFramebufferEXT)
 
                .globl _mesa_sparc_glapi_end ; .type _mesa_sparc_glapi_end,#function
 _mesa_sparc_glapi_end: