Remove carriage returns.

2 files changed, 84 insertions, 84 deletions

diff --git a/src/mesa/x86/rtasm/x86sse.c b/src/mesa/x86/rtasm/x86sse.c
index 82a18f012a..2ce1e64815 100644
--- a/src/mesa/x86/rtasm/x86sse.c
+++ b/src/mesa/x86/rtasm/x86sse.c
@@ -85,10 +85,10 @@ static void emit_modrm( struct x86_function *p,
    case mod_INDIRECT:
       break;
    case mod_DISP8:
-      emit_1b(p, regmem.disp);

+      emit_1b(p, regmem.disp);
       break;
    case mod_DISP32:
-      emit_1i(p, regmem.disp);

+      emit_1i(p, regmem.disp);
       break;
    default:
       assert(0);
@@ -222,20 +222,20 @@ GLubyte *x86_jcc_forward( struct x86_function *p,
    emit_2ub(p, 0x0f, 0x80 + cc);
    emit_1i(p, 0);
    return x86_get_label(p);
-}

-

-GLubyte *x86_jmp_forward( struct x86_function *p)

-{

-   emit_1ub(p, 0xe9);

-   emit_1i(p, 0);

-   return x86_get_label(p);

-}

-

-GLubyte *x86_call_forward( struct x86_function *p)

-{

-   emit_1ub(p, 0xe8);

-   emit_1i(p, 0);

-   return x86_get_label(p);

+}
+
+GLubyte *x86_jmp_forward( struct x86_function *p)
+{
+   emit_1ub(p, 0xe9);
+   emit_1i(p, 0);
+   return x86_get_label(p);
+}
+
+GLubyte *x86_call_forward( struct x86_function *p)
+{
+   emit_1ub(p, 0xe8);
+   emit_1i(p, 0);
+   return x86_get_label(p);
 }
 
 /* Fixup offset from forward jump:
@@ -244,29 +244,29 @@ void x86_fixup_fwd_jump( struct x86_function *p,
 			 GLubyte *fixup )
 {
    *(int *)(fixup - 4) = x86_get_label(p) - fixup;
-}

-

-void x86_jmp( struct x86_function *p, GLubyte *label)

-{

-   emit_1ub(p, 0xe9);

-   emit_1i(p, label - x86_get_label(p) - 4);

-}

-

-void x86_call( struct x86_function *p, GLubyte *label)

-{

-   emit_1ub(p, 0xe8);

-   emit_1i(p, label - x86_get_label(p) - 4);

-}

-

-/* michal:

- * Temporary. As I need immediate operands, and dont want to mess with the codegen,

- * I load the immediate into general purpose register and use it.

- */

-void x86_mov_reg_imm( struct x86_function *p, struct x86_reg dst, GLint imm )

-{

-   assert(dst.mod == mod_REG);

-   emit_1ub(p, 0xb8 + dst.idx);

-   emit_1i(p, imm);

+}
+
+void x86_jmp( struct x86_function *p, GLubyte *label)
+{
+   emit_1ub(p, 0xe9);
+   emit_1i(p, label - x86_get_label(p) - 4);
+}
+
+void x86_call( struct x86_function *p, GLubyte *label)
+{
+   emit_1ub(p, 0xe8);
+   emit_1i(p, label - x86_get_label(p) - 4);
+}
+
+/* michal:
+ * Temporary. As I need immediate operands, and dont want to mess with the codegen,
+ * I load the immediate into general purpose register and use it.
+ */
+void x86_mov_reg_imm( struct x86_function *p, struct x86_reg dst, GLint imm )
+{
+   assert(dst.mod == mod_REG);
+   emit_1ub(p, 0xb8 + dst.idx);
+   emit_1i(p, imm);
 }
 
 void x86_push( struct x86_function *p,
@@ -344,27 +344,27 @@ void x86_test( struct x86_function *p,
 {
    emit_1ub(p, 0x85);
    emit_modrm( p, dst, src );
-}

-

-void x86_add( struct x86_function *p,

-	       struct x86_reg dst,

-	       struct x86_reg src )

-{

-   emit_op_modrm(p, 0x03, 0x01, dst, src );

-}

-

-void x86_mul( struct x86_function *p,

-	       struct x86_reg src )

-{

-   assert (src.file == file_REG32 && src.mod == mod_REG);

-   emit_op_modrm(p, 0xf7, 0, x86_make_reg (file_REG32, reg_SP), src );

-}

-

-void x86_sub( struct x86_function *p,

-	       struct x86_reg dst,

-	       struct x86_reg src )

-{

-   emit_op_modrm(p, 0x2b, 0x29, dst, src );

+}
+
+void x86_add( struct x86_function *p,
+	       struct x86_reg dst,
+	       struct x86_reg src )
+{
+   emit_op_modrm(p, 0x03, 0x01, dst, src );
+}
+
+void x86_mul( struct x86_function *p,
+	       struct x86_reg src )
+{
+   assert (src.file == file_REG32 && src.mod == mod_REG);
+   emit_op_modrm(p, 0xf7, 0, x86_make_reg (file_REG32, reg_SP), src );
+}
+
+void x86_sub( struct x86_function *p,
+	       struct x86_reg dst,
+	       struct x86_reg src )
+{
+   emit_op_modrm(p, 0x2b, 0x29, dst, src );
 }
 
 
@@ -1030,12 +1030,12 @@ struct x86_reg x86_fn_arg( struct x86_function *p,
 void x86_init_func( struct x86_function *p )
 {
    x86_init_func_size(p, 1024);
-}

-

-void x86_init_func_size( struct x86_function *p, GLuint code_size )

-{

-   p->store = _mesa_exec_malloc(code_size);

-   p->csr = p->store;

+}
+
+void x86_init_func_size( struct x86_function *p, GLuint code_size )
+{
+   p->store = _mesa_exec_malloc(code_size);
+   p->csr = p->store;
 }
 
 void x86_release_func( struct x86_function *p )
diff --git a/src/mesa/x86/rtasm/x86sse.h b/src/mesa/x86/rtasm/x86sse.h
index 55a98564af..94b320eadf 100644
--- a/src/mesa/x86/rtasm/x86sse.h
+++ b/src/mesa/x86/rtasm/x86sse.h
@@ -80,7 +80,7 @@ enum sse_cc {
  */
 
 
-void x86_init_func( struct x86_function *p );

+void x86_init_func( struct x86_function *p );
 void x86_init_func_size( struct x86_function *p, GLuint code_size );
 void x86_release_func( struct x86_function *p );
 void (*x86_get_func( struct x86_function *p ))( void );
@@ -109,23 +109,23 @@ void x86_jcc( struct x86_function *p,
 	      GLubyte *label );
 
 GLubyte *x86_jcc_forward( struct x86_function *p,
-			  enum x86_cc cc );

-

-GLubyte *x86_jmp_forward( struct x86_function *p);

-

+			  enum x86_cc cc );
+
+GLubyte *x86_jmp_forward( struct x86_function *p);
+
 GLubyte *x86_call_forward( struct x86_function *p);
 
 void x86_fixup_fwd_jump( struct x86_function *p,
-			 GLubyte *fixup );

-

-void x86_jmp( struct x86_function *p, GLubyte *label );

-

-void x86_call( struct x86_function *p, GLubyte *label );

-

-/* michal:

- * Temporary. As I need immediate operands, and dont want to mess with the codegen,

- * I load the immediate into general purpose register and use it.

- */

+			 GLubyte *fixup );
+
+void x86_jmp( struct x86_function *p, GLubyte *label );
+
+void x86_call( struct x86_function *p, GLubyte *label );
+
+/* michal:
+ * Temporary. As I need immediate operands, and dont want to mess with the codegen,
+ * I load the immediate into general purpose register and use it.
+ */
 void x86_mov_reg_imm( struct x86_function *p, struct x86_reg dst, GLint imm );
 
 
@@ -168,17 +168,17 @@ void sse_mulps( struct x86_function *p, struct x86_reg dst, struct x86_reg src )
 void sse_subps( struct x86_function *p, struct x86_reg dst, struct x86_reg src );
 void sse_rsqrtss( struct x86_function *p, struct x86_reg dst, struct x86_reg src );
 void sse_shufps( struct x86_function *p, struct x86_reg dest, struct x86_reg arg0, GLubyte shuf );
-

+
 void x86_add( struct x86_function *p, struct x86_reg dst, struct x86_reg src );
 void x86_cmp( struct x86_function *p, struct x86_reg dst, struct x86_reg src );
 void x86_dec( struct x86_function *p, struct x86_reg reg );
 void x86_inc( struct x86_function *p, struct x86_reg reg );
 void x86_lea( struct x86_function *p, struct x86_reg dst, struct x86_reg src );
-void x86_mov( struct x86_function *p, struct x86_reg dst, struct x86_reg src );

+void x86_mov( struct x86_function *p, struct x86_reg dst, struct x86_reg src );
 void x86_mul( struct x86_function *p, struct x86_reg src );
 void x86_pop( struct x86_function *p, struct x86_reg reg );
 void x86_push( struct x86_function *p, struct x86_reg reg );
-void x86_ret( struct x86_function *p );

+void x86_ret( struct x86_function *p );
 void x86_sub( struct x86_function *p, struct x86_reg dst, struct x86_reg src );
 void x86_test( struct x86_function *p, struct x86_reg dst, struct x86_reg src );
 void x86_xor( struct x86_function *p, struct x86_reg dst, struct x86_reg src );