6 files changed, 89 insertions, 85 deletions

diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi
index 4d5dc101..07b5ec8b 100644
--- a/doc/mailfromd.texi
+++ b/doc/mailfromd.texi
@@ -8998,7 +8998,7 @@ configuration directory set when building @command{mailfromd}
 (@pxref{Building}).}  If it does, the program attempts to retrieve
 its configuration settings from that file.
 
-  The @file{mailfromd.conf} must have the @dfn{GNU mailutils
+  The @file{mailfromd.conf} file must be written in the @dfn{GNU mailutils
 configuration format}, as described in @ref{conf-syntax, Configuration
 File Syntax,, mailutils, GNU Mailutils Manual}.  This format can be
 summarized as follows:
diff --git a/src/drivers.c b/src/drivers.c
index 0ef1de57..721764e3 100644
--- a/src/drivers.c
+++ b/src/drivers.c
@@ -19,8 +19,8 @@
                 struct literal *lit = literal_lookup(node->locus.file);  \
                 *old_locus = &node->locus;                               \
                 code_op(opcode_locus);                                   \
-                code_immediate((STKVAL)lit->off);                        \
-                code_immediate((STKVAL)node->locus.line);                \
+                code_immediate(lit->off, ulong);                         \
+                code_immediate(node->locus.line, str);                   \
         } while (0)
 
 static void code_trycatch_exit(unsigned id);
@@ -34,19 +34,19 @@ code_memref(NODE *node)
         switch (node->v.var_ref.variable->storage_class) {
         case storage_extern:
                 code_op(opcode_push);
-                code_immediate((STKVAL)node->v.var_ref.variable->off);
+                code_immediate(node->v.var_ref.variable->off, long);
                 break;
 
         case storage_auto:
                 code_op(opcode_memstk);
-                code_immediate((STKVAL)node->v.var_ref.nframes);
-                code_immediate((STKVAL)(-node->v.var_ref.variable->off));
+                code_immediate(node->v.var_ref.nframes, size);
+                code_immediate((-node->v.var_ref.variable->off), long);
                 break;
 
         case storage_param:
                 code_op(opcode_memstk);
-                code_immediate((STKVAL)node->v.var_ref.nframes);
-                code_immediate((STKVAL)(node->v.var_ref.variable->off + 2));
+                code_immediate(node->v.var_ref.nframes, size);
+                code_immediate((node->v.var_ref.variable->off + 2), long);
                 break;
         }
 }
@@ -78,7 +78,7 @@ code_type_string(NODE *node, struct locus **old_locus)
 {
         MARK_LOCUS();
         code_op(opcode_push);
-        code_immediate((STKVAL)node->v.literal->off);
+        code_immediate(node->v.literal->off, size);
 }
 
 
@@ -96,7 +96,7 @@ code_type_symbol(NODE *node, struct locus **old_locus)
 {
         MARK_LOCUS();
         code_op(opcode_symbol);
-        code_immediate((STKVAL)node->v.literal->off);
+        code_immediate(node->v.literal->off, size);
 }
 
 void
@@ -119,7 +119,7 @@ code_type_number(NODE *node, struct locus **old_locus)
 {
         MARK_LOCUS();
         code_op(opcode_push);
-        code_immediate((STKVAL)node->v.number);
+        code_immediate(node->v.number, long);
 }
 
 
@@ -205,17 +205,17 @@ code_type_if(NODE *node, struct locus **old_locus)
         code_node(node->v.cond.cond);
         MARK_LOCUS();
         code_op(opcode_bz);
-        pos1 = code_immediate((STKVAL)NULL);
+        pos1 = code_immediate(NULL, ptr);
         traverse_tree(node->v.cond.if_true);
         if (node->v.cond.if_false) {
                 code_op(opcode_jmp);
-                pos2 = code_immediate((STKVAL)NULL);
+                pos2 = code_immediate(NULL, ptr);
                 traverse_tree(node->v.cond.if_false);
                 endpos = code_get_counter ();
-                code_put(pos1, (STKVAL)(pos2 - pos1));
-                code_put(pos2, (STKVAL)(endpos - pos2 - 1));
+                code_put(pos1, (pos2 - pos1), long);
+                code_put(pos2, (endpos - pos2 - 1), long);
         } else 
-                code_put(pos1, (STKVAL)(code_get_counter () - pos1 - 1));
+                code_put(pos1, (code_get_counter () - pos1 - 1), long);
 }
 
 
@@ -785,17 +785,17 @@ code_type_bin(NODE *node, struct locus **old_locus)
                    Y: push 1
                    Z: */
                 code_op(opcode_bz);
-                pos1 = code_immediate((STKVAL)NULL);
+                pos1 = code_immediate(NULL, ptr);
                 code_node(node->v.bin.arg[1]);
                 code_op(opcode_bnz);
-                pos2 = code_immediate((STKVAL)4);
+                pos2 = code_immediate(4, long);
                 code_op(opcode_push);
-                code_immediate((STKVAL)0);
+                code_immediate(0, long);
                 code_op(opcode_jmp);
-                code_immediate((STKVAL)2);
+                code_immediate(2, long);
                 code_op(opcode_push);
-                code_immediate((STKVAL)1);
-                code_put(pos1, (STKVAL)(pos2 - pos1));
+                code_immediate(1, long);
+                code_put(pos1, (pos2 - pos1), long);
                 break;
                         
         case bin_or:
@@ -810,17 +810,17 @@ code_type_bin(NODE *node, struct locus **old_locus)
                    Z: */
                 
                 code_op(opcode_bnz);
-                pos1 = code_immediate((STKVAL)NULL);
+                pos1 = code_immediate(NULL, ptr);
                 code_node(node->v.bin.arg[1]);
                 code_op(opcode_bz);
-                pos2 = code_immediate((STKVAL)4);
+                pos2 = code_immediate(4, long);
                 code_op(opcode_push);
-                code_immediate((STKVAL)1);
+                code_immediate(1, long);
                 code_op(opcode_jmp);
-                code_immediate((STKVAL)2);
+                code_immediate(2, long);
                 code_op(opcode_push);
-                code_immediate((STKVAL)0);
-                code_put(pos1, (STKVAL)(pos2 - pos1));
+                code_immediate(0, long);
+                code_put(pos1, (pos2 - pos1), long);
                 break;
                 
         case bin_eq:
@@ -1062,7 +1062,7 @@ code_result_arg(NODE *node)
                 code_node(node);
         else {
                 code_op(opcode_push);
-                code_immediate((STKVAL)NULL);
+                code_immediate(NULL, ptr);
         }
 }
 
@@ -1115,7 +1115,7 @@ code_type_result(NODE *node, struct locus **old_locus)
                         
         MARK_LOCUS();
         code_op(opcode_result);
-        code_immediate((STKVAL)(mft_int)node->v.ret.stat);
+        code_immediate(node->v.ret.stat, int);
         code_op(opcode_nil);
 }
 
@@ -1152,11 +1152,11 @@ code_type_header(NODE *node, struct locus **old_locus)
                 code_node(node->v.hdr.value);
         else {
                 code_op(opcode_push);
-                code_immediate((STKVAL)0);
+                code_immediate(0, size);
         }
         code_op(opcode_header);
-        code_immediate((STKVAL)(mft_int)node->v.hdr.opcode);
-        code_immediate((STKVAL)node->v.hdr.name->off);
+        code_immediate(node->v.hdr.opcode, int);
+        code_immediate(node->v.hdr.name->off, size);
 }
 
 
@@ -1224,14 +1224,14 @@ code_type_builtin(NODE *node, struct locus **old_locus)
         if (bp->optcount || (bp->flags & MFD_BUILTIN_VARIADIC)) {
                 /* Pass the number of actual arguments in a hidden arg */
                 code_op(opcode_push);
-                code_immediate((STKVAL)i);
+                code_immediate(i, size);
         }