documented new builtin table

made builtintablelen static again

diff --git a/builtin.h b/builtin.h
index 51b2900def2d30a95334f8e1245756d8a8f30998..7af6d09d4a8a43738bfa308927726268e6e20c2f 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -26,7 +26,9 @@
 
    Authors: Reinhard Grafl
 
-   $Id: builtin.h 727 2003-12-11 10:52:40Z edwin $
+   Changes: Edwin Steiner
+
+   $Id: builtin.h 728 2003-12-11 11:11:05Z edwin $
 
 */
 
@@ -47,6 +49,15 @@
 #define DBL_POSINF  0x7ff0000000000000LL
 #define DBL_NEGINF  0xfff0000000000000LL
 
+/**********************************************************************/
+/* BUILTIN FUNCTIONS TABLE                                            */
+/**********************************************************************/
+
+/* IMPORTANT:
+ * For each builtin function which is used in a BUILTIN* opcode there
+ * must be an entry in the builtin_desc table in jit/jit.c.
+ */
+ 
 /* XXX delete */
 #if 0
 typedef struct builtin_descriptor {
@@ -57,21 +68,30 @@ typedef struct builtin_descriptor {
 
 typedef struct builtin_descriptor builtin_descriptor;
 
+/* There is a builtin_descriptor in builtin_desc for every builtin
+ * function used in BUILTIN* opcodes.
+ */
 struct builtin_descriptor {
-       int         opcode;
-       functionptr builtin;
-       int         icmd;
-       u1          type_s1;
-       u1          type_s2;
-       u1          type_s3;
-       u1          type_d;
-       bool        supported;
-       bool        isfloat;
-       char        *name;
+       int         opcode;   /* opcode which is replaced by this builtin */
+                             /* (255 means no automatic replacement,     */
+                             /*    0 means end of list.)                 */
+       functionptr builtin;  /* the builtin function (specify BUILTIN_...*/
+                             /* macro)                                   */
+       int         icmd;     /* the BUILTIN* opcode to use (# of args)   */
+       u1          type_s1;  /* type of 1st argument                     */
+       u1          type_s2;  /* type of 2nd argument, or TYPE_VOID       */
+       u1          type_s3;  /* type of 3rd argument, or TYPE_VOID       */
+       u1          type_d;   /* type of result (may be TYPE_VOID)        */
+       bool        supported;/* is <opcode> supported without builtin?   */
+       bool        isfloat;  /* is this a floating point operation?      */
+       char        *name;    /* display name of the builtin function     */
 };
 
 extern builtin_descriptor builtin_desc[];
-extern int builtintablelen;
+
+/**********************************************************************/
+/* GLOBAL VARIABLES                                                   */
+/**********************************************************************/
 
 extern java_objectheader* exceptionptr;
 
@@ -91,7 +111,7 @@ extern java_objectheader* exceptionptr;
  *
  * IMPORTANT:
  * For each builtin function which is used in a BUILTIN* opcode there
- * must be an entry in the builtin_desc table in builtin.c!
+ * must be an entry in the builtin_desc table in jit/jit.c.
  *
  * Below each prototype is either the BUILTIN_ macro definition or a
  * comment specifiying that this function is not used in BUILTIN*

diff --git a/jit/jit.c b/jit/jit.c
index a72d201a7c097c1f84f55f12e44de70dc113a3d8..ea0f2a072904f7b862fcbbebdfc35309f7b7bf76 100644 (file)
--- a/jit/jit.c
+++ b/jit/jit.c
@@ -27,7 +27,9 @@
    Authors: Andreas Krall
             Reinhard Grafl
 
-   $Id: jit.c 727 2003-12-11 10:52:40Z edwin $
+   Changes: Edwin Steiner
+
+   $Id: jit.c 728 2003-12-11 11:11:05Z edwin $
 
 */
 
@@ -1306,7 +1308,8 @@ stdopdescriptor builtintable[] = {
 };
 
 #endif
-int builtintablelen; /* XXX make static again? */
+
+static int builtintablelen;
 
 #endif /* USEBUILTINTABLE */
 
@@ -1320,8 +1323,8 @@ int builtintablelen; /* XXX make static again? */
     The first part of the table (up to the 255-marker) lists the
     opcodes which are automatically replaced in stack.c.
 
-    The second part lists the builtin functions which are used for
-    BUILTIN* opcodes in parse.c and stack.c.
+    The second part lists the builtin functions which are "manually"
+    used for BUILTIN* opcodes in parse.c and stack.c.
 
 *****************************************************************************/
 

diff --git a/src/vm/builtin.h b/src/vm/builtin.h
index 51b2900def2d30a95334f8e1245756d8a8f30998..7af6d09d4a8a43738bfa308927726268e6e20c2f 100644 (file)
--- a/src/vm/builtin.h
+++ b/src/vm/builtin.h
@@ -26,7 +26,9 @@
 
    Authors: Reinhard Grafl
 
-   $Id: builtin.h 727 2003-12-11 10:52:40Z edwin $
+   Changes: Edwin Steiner
+
+   $Id: builtin.h 728 2003-12-11 11:11:05Z edwin $
 
 */
 
@@ -47,6 +49,15 @@
 #define DBL_POSINF  0x7ff0000000000000LL
 #define DBL_NEGINF  0xfff0000000000000LL
 
+/**********************************************************************/
+/* BUILTIN FUNCTIONS TABLE                                            */
+/**********************************************************************/
+
+/* IMPORTANT:
+ * For each builtin function which is used in a BUILTIN* opcode there
+ * must be an entry in the builtin_desc table in jit/jit.c.
+ */
+ 
 /* XXX delete */
 #if 0
 typedef struct builtin_descriptor {
@@ -57,21 +68,30 @@ typedef struct builtin_descriptor {
 
 typedef struct builtin_descriptor builtin_descriptor;
 
+/* There is a builtin_descriptor in builtin_desc for every builtin
+ * function used in BUILTIN* opcodes.
+ */
 struct builtin_descriptor {
-       int         opcode;
-       functionptr builtin;
-       int         icmd;
-       u1          type_s1;
-       u1          type_s2;
-       u1          type_s3;
-       u1          type_d;
-       bool        supported;
-       bool        isfloat;
-       char        *name;
+       int         opcode;   /* opcode which is replaced by this builtin */
+                             /* (255 means no automatic replacement,     */
+                             /*    0 means end of list.)                 */
+       functionptr builtin;  /* the builtin function (specify BUILTIN_...*/
+                             /* macro)                                   */
+       int         icmd;     /* the BUILTIN* opcode to use (# of args)   */
+       u1          type_s1;  /* type of 1st argument                     */
+       u1          type_s2;  /* type of 2nd argument, or TYPE_VOID       */
+       u1          type_s3;  /* type of 3rd argument, or TYPE_VOID       */
+       u1          type_d;   /* type of result (may be TYPE_VOID)        */
+       bool        supported;/* is <opcode> supported without builtin?   */
+       bool        isfloat;  /* is this a floating point operation?      */
+       char        *name;    /* display name of the builtin function     */
 };
 
 extern builtin_descriptor builtin_desc[];
-extern int builtintablelen;
+
+/**********************************************************************/
+/* GLOBAL VARIABLES                                                   */
+/**********************************************************************/
 
 extern java_objectheader* exceptionptr;
 
@@ -91,7 +111,7 @@ extern java_objectheader* exceptionptr;
  *
  * IMPORTANT:
  * For each builtin function which is used in a BUILTIN* opcode there
- * must be an entry in the builtin_desc table in builtin.c!
+ * must be an entry in the builtin_desc table in jit/jit.c.
  *
  * Below each prototype is either the BUILTIN_ macro definition or a
  * comment specifiying that this function is not used in BUILTIN*

diff --git a/src/vm/jit/jit.c b/src/vm/jit/jit.c
index a72d201a7c097c1f84f55f12e44de70dc113a3d8..ea0f2a072904f7b862fcbbebdfc35309f7b7bf76 100644 (file)
--- a/src/vm/jit/jit.c
+++ b/src/vm/jit/jit.c
@@ -27,7 +27,9 @@
    Authors: Andreas Krall
             Reinhard Grafl
 
-   $Id: jit.c 727 2003-12-11 10:52:40Z edwin $
+   Changes: Edwin Steiner
+
+   $Id: jit.c 728 2003-12-11 11:11:05Z edwin $
 
 */
 
@@ -1306,7 +1308,8 @@ stdopdescriptor builtintable[] = {
 };
 
 #endif
-int builtintablelen; /* XXX make static again? */
+
+static int builtintablelen;
 
 #endif /* USEBUILTINTABLE */
 
@@ -1320,8 +1323,8 @@ int builtintablelen; /* XXX make static again? */
     The first part of the table (up to the 255-marker) lists the
     opcodes which are automatically replaced in stack.c.
 
-    The second part lists the builtin functions which are used for
-    BUILTIN* opcodes in parse.c and stack.c.
+    The second part lists the builtin functions which are "manually"
+    used for BUILTIN* opcodes in parse.c and stack.c.
 
 *****************************************************************************/