Alexandre Julliard : winebuild: Get rid of the data16 prefix, it shouldn' t be needed anymore and causes warnings.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: d489a0a312a8bc527c51b8ec1aa56b6c16e8223e
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=d489a0a312a8bc527c51b8ec...

Author: Alexandre Julliard 
Date:   Mon Jun 19 21:16:50 2006 +0200

winebuild: Get rid of the data16 prefix, it shouldn't be needed anymore and causes warnings.

---

tools/winebuild/build.h |    2 +-
 tools/winebuild/main.c  |    3 ---
 tools/winebuild/relay.c |   19 +++++++------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h
index ef7be19..74e6713 100644
--- a/tools/winebuild/build.h
+++ b/tools/winebuild/build.h
@@ -115,7 +115,7 @@ enum target_cpu

enum target_platform
 {
-    PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_SVR4, PLATFORM_WINDOWS
+    PLATFORM_UNSPECIFIED, PLATFORM_APPLE, PLATFORM_WINDOWS
 };

extern enum target_cpu target_cpu;
diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
index b510c3a..ed9d4b3 100644
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
@@ -65,8 +65,6 @@ #endif

#ifdef __APPLE__
 enum target_platform target_platform = PLATFORM_APPLE;
-#elif defined(__svr4__)
-enum target_platform target_platform = PLATFORM_SVR4;
 #elif defined(_WINDOWS)
 enum target_platform target_platform = PLATFORM_WINDOWS;
 #else
@@ -126,7 +124,6 @@ static const struct
 {
     { "macos",   PLATFORM_APPLE },
     { "darwin",  PLATFORM_APPLE },
-    { "sunos",   PLATFORM_SVR4 },
     { "windows", PLATFORM_WINDOWS },
     { "winnt",   PLATFORM_WINDOWS }
 };
diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c
index 50794ba..2196a88 100644
--- a/tools/winebuild/relay.c
+++ b/tools/winebuild/relay.c
@@ -58,11 +58,6 @@ static void function_header( FILE *outfi
 }

-static inline const char *data16_prefix(void)
-{
-    return (target_platform == PLATFORM_SVR4) ? "\tdata16\n" : "";
-}
-
 /*******************************************************************
  *         BuildCallFrom16Core
  *
@@ -160,8 +155,8 @@ static void BuildCallFrom16Core( FILE *o
         fprintf( outfile, "\t.byte 0x2e\n\tmovl %s,%%edx\n", asm_name("CallTo16_DataSelector") );

/* Load 32-bit segment registers */
-    fprintf( outfile, "%s\tmovw %%dx, %%ds\n", data16_prefix() );
-    fprintf( outfile, "%s\tmovw %%dx, %%es\n", data16_prefix() );
+    fprintf( outfile, "\tmovw %%dx, %%ds\n" );
+    fprintf( outfile, "\tmovw %%dx, %%es\n" );

if ( UsePIC )
         fprintf( outfile, "\tmovw %s-1b(%%ecx), %%fs\n", asm_name("CallTo16_TebSelector") );
@@ -192,7 +187,7 @@ static void BuildCallFrom16Core( FILE *o
     fprintf( outfile, "\tpushl %%ebp\n" );

/* Switch stacks */
-    fprintf( outfile, "%s\t.byte 0x64\n\tmovw %%ss, (%d)\n", data16_prefix(), STACKOFFSET + 2 );
+    fprintf( outfile, "\t.byte 0x64\n\tmovw %%ss, (%d)\n", STACKOFFSET + 2 );
     fprintf( outfile, "\t.byte 0x64\n\tmovw %%sp, (%d)\n", STACKOFFSET );
     fprintf( outfile, "\tpushl %%ds\n" );
     fprintf( outfile, "\tpopl %%ss\n" );
@@ -475,7 +470,7 @@ static void BuildCallTo16Core( FILE *out

/* Switch to the 16-bit stack */
     fprintf( outfile, "\tmovl %%esp,%%edx\n" );
-    fprintf( outfile, "%s\t.byte 0x64\n\tmovw (%d),%%ss\n", data16_prefix(), STACKOFFSET + 2);
+    fprintf( outfile, "\t.byte 0x64\n\tmovw (%d),%%ss\n", STACKOFFSET + 2);
     fprintf( outfile, "\t.byte 0x64\n\tmovw (%d),%%sp\n", STACKOFFSET );
     fprintf( outfile, "\t.byte 0x64\n\tmovl %%edx,(%d)\n", STACKOFFSET );

@@ -554,8 +549,8 @@ static void BuildRet16Func( FILE *outfil

fprintf( outfile, "\t.byte 0x2e\n\tmovl %s", asm_name("CallTo16_DataSelector") );
     fprintf( outfile, "-%s,%%edi\n", asm_name("__wine_call16_start") );
-    fprintf( outfile, "%s\tmovw %%di,%%ds\n", data16_prefix() );
-    fprintf( outfile, "%s\tmovw %%di,%%es\n", data16_prefix() );
+    fprintf( outfile, "\tmovw %%di,%%ds\n" );
+    fprintf( outfile, "\tmovw %%di,%%es\n" );

fprintf( outfile, "\t.byte 0x2e\n\tmov %s", asm_name("CallTo16_TebSelector") );
     fprintf( outfile, "-%s,%%fs\n", asm_name("__wine_call16_start") );
@@ -564,7 +559,7 @@ static void BuildRet16Func( FILE *outfil

/* Restore the 32-bit stack */

-    fprintf( outfile, "%s\tmovw %%di,%%ss\n", data16_prefix() );
+    fprintf( outfile, "\tmovw %%di,%%ss\n" );
     fprintf( outfile, "\t.byte 0x64\n\tmovl (%d),%%esp\n", STACKOFFSET );

/* Return to caller */