summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gallium/auxiliary/rtasm/Makefile3
-rw-r--r--src/gallium/auxiliary/rtasm/SConscript3
-rw-r--r--src/gallium/auxiliary/rtasm/rtasm_ppc_spe.c (renamed from src/mesa/ppc/rtasm/spe_asm.c)17
-rw-r--r--src/gallium/auxiliary/rtasm/rtasm_ppc_spe.h (renamed from src/mesa/ppc/rtasm/spe_asm.h)8
-rw-r--r--src/gallium/drivers/cell/ppu/cell_context.h2
-rw-r--r--src/gallium/drivers/cell/ppu/cell_vertex_fetch.c2
-rw-r--r--src/mesa/sources1
7 files changed, 19 insertions, 17 deletions
diff --git a/src/gallium/auxiliary/rtasm/Makefile b/src/gallium/auxiliary/rtasm/Makefile
index 9b972f8f86..39b8a4dbd7 100644
--- a/src/gallium/auxiliary/rtasm/Makefile
+++ b/src/gallium/auxiliary/rtasm/Makefile
@@ -6,7 +6,8 @@ LIBNAME = rtasm
C_SOURCES = \
rtasm_cpu.c \
rtasm_execmem.c \
- rtasm_x86sse.c
+ rtasm_x86sse.c \
+ rtasm_ppc_spe.c
include ../../Makefile.template
diff --git a/src/gallium/auxiliary/rtasm/SConscript b/src/gallium/auxiliary/rtasm/SConscript
index ac41a4f212..8ea25922aa 100644
--- a/src/gallium/auxiliary/rtasm/SConscript
+++ b/src/gallium/auxiliary/rtasm/SConscript
@@ -5,7 +5,8 @@ rtasm = env.ConvenienceLibrary(
source = [
'rtasm_cpu.c',
'rtasm_execmem.c',
- 'rtasm_x86sse.c'
+ 'rtasm_x86sse.c',
+ 'rtasm_ppc_spe.c',
])
auxiliaries.insert(0, rtasm)
diff --git a/src/mesa/ppc/rtasm/spe_asm.c b/src/gallium/auxiliary/rtasm/rtasm_ppc_spe.c
index 1037637250..95a2d6fcbb 100644
--- a/src/mesa/ppc/rtasm/spe_asm.c
+++ b/src/gallium/auxiliary/rtasm/rtasm_ppc_spe.c
@@ -23,16 +23,17 @@
*/
/**
- * \file spe_asm.c
+ * \file
* Real-time assembly generation interface for Cell B.E. SPEs.
*
* \author Ian Romanick <idr@us.ibm.com>
*/
-#ifdef GALLIUM_CELL
-#include <inttypes.h>
-#include <imports.h>
-#include "spe_asm.h"
+#include "pipe/p_compiler.h"
+#include "pipe/p_util.h"
+#include "rtasm_ppc_spe.h"
+
+#ifdef GALLIUM_CELL
/**
* SPE instruction types
*
@@ -296,21 +297,21 @@ void _name (struct spe_function *p, int imm) \
emit_RI16(p, _op, 0, imm); \
}
-#include "spe_asm.h"
+#include "rtasm_ppc_spe.h"
/*
*/
void spe_init_func(struct spe_function *p, unsigned code_size)
{
- p->store = _mesa_align_malloc(code_size, 16);
+ p->store = align_malloc(code_size, 16);
p->csr = p->store;
}
void spe_release_func(struct spe_function *p)
{
- _mesa_align_free(p->store);
+ align_free(p->store);
p->store = NULL;
p->csr = NULL;
}
diff --git a/src/mesa/ppc/rtasm/spe_asm.h b/src/gallium/auxiliary/rtasm/rtasm_ppc_spe.h
index 6d69ae655d..10ce44b3a0 100644
--- a/src/mesa/ppc/rtasm/spe_asm.h
+++ b/src/gallium/auxiliary/rtasm/rtasm_ppc_spe.h
@@ -23,14 +23,14 @@
*/
/**
- * \file spe_asm.h
+ * \file
* Real-time assembly generation interface for Cell B.E. SPEs.
*
* \author Ian Romanick <idr@us.ibm.com>
*/
-#ifndef SPE_ASM_H
-#define SPE_ASM_H
+#ifndef RTASM_PPC_SPE_H
+#define RTASM_PPC_SPE_H
struct spe_function {
/**
@@ -44,7 +44,7 @@ struct spe_function {
extern void spe_init_func(struct spe_function *p, unsigned code_size);
extern void spe_release_func(struct spe_function *p);
-#endif /* SPE_ASM_H */
+#endif /* RTASM_PPC_SPE_H */
#ifndef EMIT_
#define EMIT_(name, _op) \
diff --git a/src/gallium/drivers/cell/ppu/cell_context.h b/src/gallium/drivers/cell/ppu/cell_context.h
index 91f8e542a2..3b687bb868 100644
--- a/src/gallium/drivers/cell/ppu/cell_context.h
+++ b/src/gallium/drivers/cell/ppu/cell_context.h
@@ -36,7 +36,7 @@
#include "draw/draw_vbuf.h"
#include "cell_winsys.h"
#include "cell/common.h"
-#include "ppc/rtasm/spe_asm.h"
+#include "rtasm/rtasm_ppc_spe.h"
struct cell_vbuf_render;
diff --git a/src/gallium/drivers/cell/ppu/cell_vertex_fetch.c b/src/gallium/drivers/cell/ppu/cell_vertex_fetch.c
index f10689a959..9cf74bab47 100644
--- a/src/gallium/drivers/cell/ppu/cell_vertex_fetch.c
+++ b/src/gallium/drivers/cell/ppu/cell_vertex_fetch.c
@@ -31,7 +31,7 @@
#include "../auxiliary/draw/draw_private.h"
#include "cell_context.h"
-#include "ppc/rtasm/spe_asm.h"
+#include "rtasm/rtasm_ppc_spe.h"
typedef uint64_t register_mask;
diff --git a/src/mesa/sources b/src/mesa/sources
index 9e56694893..f0bf7b31fb 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -246,7 +246,6 @@ ASM_C_SOURCES = \
x86/rtasm/x86sse.c \
sparc/sparc.c \
ppc/common_ppc.c \
- ppc/rtasm/spe_asm.c \
x86-64/x86-64.c
X86_SOURCES = \