[dotgnu-pnet-commits] libjit ChangeLog dpas/dpas-scanner.l include/ji...

[Klaus Treichel]

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    libjit
Changes by:     Klaus Treichel <ktreichel>      08/05/23 11:00:43

Modified files:
        .              : ChangeLog 
        dpas           : dpas-scanner.l 
        include/jit    : jit-arch-x86.h jit-arch-x86-64.h 
        jit            : jit-rules-x86.ins 
        tools          : gen-sel-scanner.l gen-rules-scanner.l 

Log message:
        Fix build with MS cl on windows and some ANSI C issues.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libjit/ChangeLog?cvsroot=dotgnu-pnet&r1=1.372&r2=1.373
http://cvs.savannah.gnu.org/viewcvs/libjit/dpas/dpas-scanner.l?cvsroot=dotgnu-pnet&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/libjit/include/jit/jit-arch-x86.h?cvsroot=dotgnu-pnet&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/libjit/include/jit/jit-arch-x86-64.h?cvsroot=dotgnu-pnet&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libjit/jit/jit-rules-x86.ins?cvsroot=dotgnu-pnet&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/libjit/tools/gen-sel-scanner.l?cvsroot=dotgnu-pnet&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/libjit/tools/gen-rules-scanner.l?cvsroot=dotgnu-pnet&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/libjit/ChangeLog,v
retrieving revision 1.372
retrieving revision 1.373
diff -u -b -r1.372 -r1.373
--- ChangeLog   21 May 2008 08:36:29 -0000      1.372
+++ ChangeLog   23 May 2008 11:00:42 -0000      1.373
@@ -1,3 +1,17 @@
+2008-05-23  Klaus Treichel   <address@hidden>
+
+       * dpas/dpas-scanner.l, tools/gen-rules-scanner.l,
+       tools/gen-sel-scanner.l: Define YY_NO_UNISTD_H if unistd.h is not
+       available to prevent flex from including unistd.h.
+
+       * include/jit/jit-arch-x86.h, include/jit/jit-arch-x86.h: Fix the
+        definition of _JIT_ARCH_GET_CURRENT_FRAME for MS cl. Use a
+       temporary value for ebp/rbp because cl doesn't like arguments like
+       f->x in the __asm statements.
+
+       * jit/jit-rules-x86.ins: Move declaration of patch to the start of
+       the block in JIT_OP_ULONG_TO_NFLOAT to be ANSI C compliant.
+
 2008-05-21  Aleksey Demakov  <address@hidden>
 
        * include/jit/jit-walk.h (jit_get_next_frame_address): use

Index: dpas/dpas-scanner.l
===================================================================
RCS file: /cvsroot/dotgnu-pnet/libjit/dpas/dpas-scanner.l,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- dpas/dpas-scanner.l 27 Feb 2008 08:53:41 -0000      1.5
+++ dpas/dpas-scanner.l 23 May 2008 11:00:42 -0000      1.6
@@ -23,6 +23,10 @@
 
 #include "dpas-internal.h"
 #include "dpas-parser.h"
+#include <config.h>
+#ifndef HAVE_UNISTD_H
+       #define YY_NO_UNISTD_H
+#endif
 
 extern YYSTYPE yylval;
 

Index: include/jit/jit-arch-x86.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/libjit/include/jit/jit-arch-x86.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- include/jit/jit-arch-x86.h  24 Jan 2008 20:12:49 -0000      1.3
+++ include/jit/jit-arch-x86.h  23 May 2008 11:00:43 -0000      1.4
@@ -34,10 +34,12 @@
 #elif defined(_MSC_VER) && defined(_M_IX86)
 #define        _JIT_ARCH_GET_CURRENT_FRAME(f)          \
        do {                                    \
+               void *__ptr;                    \
                __asm                           \
                {                               \
-                       mov dword ptr f, ebp    \
+                       __asm mov dword ptr __ptr, ebp  \
                }                               \
+               (f) = __ptr;                    \
        } while(0)
 #else
 #undef _JIT_ARCH_GET_CURRENT_FRAME

Index: include/jit/jit-arch-x86-64.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/libjit/include/jit/jit-arch-x86-64.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- include/jit/jit-arch-x86-64.h       13 Apr 2008 16:14:15 -0000      1.1
+++ include/jit/jit-arch-x86-64.h       23 May 2008 11:00:43 -0000      1.2
@@ -44,10 +44,12 @@
 #elif defined(_MSC_VER) && defined(_M_IX86)
 #define        _JIT_ARCH_GET_CURRENT_FRAME(f)          \
        do {                                    \
+               void *__ptr;                    \
                __asm                           \
                {                               \
-                       mov qword ptr f, rbp    \
+                       __asm mov qword ptr __ptr, rbp  \
                }                               \
+               (f) = __ptr;                    \
        } while(0)
 #else
 #undef _JIT_ARCH_GET_CURRENT_FRAME

Index: jit/jit-rules-x86.ins
===================================================================
RCS file: /cvsroot/dotgnu-pnet/libjit/jit/jit-rules-x86.ins,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- jit/jit-rules-x86.ins       8 May 2008 06:39:51 -0000       1.37
+++ jit/jit-rules-x86.ins       23 May 2008 11:00:43 -0000      1.38
@@ -221,12 +221,12 @@
                /* TODO: review wrt relocation for elf pre-compilation */
                static float f2pow64;
                static int inited;
+               unsigned char *patch;
                if(!inited)
                {
                        f2pow64 = jit_float32_pow(2.0, 64);
                        inited = 1;
                }
-               unsigned char *patch;
                x86_push_reg(inst, %2);
                x86_push_reg(inst, $2);
                x86_fild_membase(inst, X86_ESP, 0, 1);

Index: tools/gen-sel-scanner.l
===================================================================
RCS file: /cvsroot/dotgnu-pnet/libjit/tools/gen-sel-scanner.l,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tools/gen-sel-scanner.l     27 Feb 2008 08:53:42 -0000      1.8
+++ tools/gen-sel-scanner.l     23 May 2008 11:00:43 -0000      1.9
@@ -32,6 +32,9 @@
 #ifdef HAVE_STDLIB_H
        #include <stdlib.h>
 #endif
+#ifndef HAVE_UNISTD_H
+       #define YY_NO_UNISTD_H
+#endif
 
 extern YYSTYPE yylval;
 

Index: tools/gen-rules-scanner.l
===================================================================
RCS file: /cvsroot/dotgnu-pnet/libjit/tools/gen-rules-scanner.l,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tools/gen-rules-scanner.l   27 Feb 2008 08:53:41 -0000      1.6
+++ tools/gen-rules-scanner.l   23 May 2008 11:00:43 -0000      1.7
@@ -32,6 +32,9 @@
 #ifdef HAVE_STDLIB_H
        #include <stdlib.h>
 #endif
+#ifndef HAVE_UNISTD_H
+       #define YY_NO_UNISTD_H
+#endif
 
 extern YYSTYPE yylval;