(instr_nop): New function

(instr_allof, instr_anyof): Removed

@@ -31,6 +31,14 @@
   && (m)->debug_printer)
 #define INSTR_DISASS(m) ((m)->debug_level & MU_SIEVE_DEBUG_DISAS)
 
+void
+instr_nop (sieve_machine_t mach)
+{
+  if (INSTR_DEBUG (mach))
+    sieve_debug (mach, "%4lu: NOP\n",
+		 (unsigned long) (mach->pc - 1));
+}
+
 static int
 instr_run (sieve_machine_t mach)
 {
@@ -113,99 +121,70 @@ instr_pop (sieve_machine_t mach)
 }
 
 void
-instr_allof (sieve_machine_t mach)
+instr_not (sieve_machine_t mach)
 {
-  int num = SIEVE_ARG (mach, 0, number);
-  int val = 1;
-
-  SIEVE_ADJUST(mach, 1);
-
   if (INSTR_DEBUG (mach))
     {
-      sieve_debug (mach, "%4lu: ALLOF %d\n", (unsigned long)(mach->pc - 2),
-		   num);
+      sieve_debug (mach, "%4lu: NOT\n", (unsigned long)(mach->pc - 1));
       if (INSTR_DISASS (mach))
 	return;
     }
-  
-  while (num-- > 0)
-    {
-      instr_pop (mach);
-      val &= mach->reg;
-    }
-  mach->reg = val;
+  mach->reg = !mach->reg;
 }
 
 void
-instr_anyof (sieve_machine_t mach)
+instr_branch (sieve_machine_t mach)
 {
-  int num = SIEVE_ARG (mach, 0, number);
-  int val = 0;
-
-  SIEVE_ADJUST(mach, 1);
+  long num = SIEVE_ARG (mach, 0, number);
 
+  SIEVE_ADJUST (mach, 1);
   if (INSTR_DEBUG (mach))
     {
-      sieve_debug (mach, "%4lu: ANYOF %d\n", (unsigned long)(mach->pc - 2),
-		   num);
+      sieve_debug (mach, "%4lu: BRANCH %lu\n",
+		   (unsigned long)(mach->pc-2),
+		   (unsigned long)(mach->pc + num));
       if (INSTR_DISASS (mach))
 	return;
     }
 
-  while (num-- > 0)
-    {
-      instr_pop (mach);
-      val |= mach->reg;
-    }
-  mach->reg = val;
-}
-
-void
-instr_not (sieve_machine_t mach)
-{
-  if (INSTR_DEBUG (mach))
-    {
-      sieve_debug (mach, "%4lu: NOT\n", (unsigned long)(mach->pc - 1));
-      if (INSTR_DISASS (mach))
-	return;
-    }
-  mach->reg = !mach->reg;
+  mach->pc += num;
 }
 
 void
-instr_branch (sieve_machine_t mach)
+instr_brz (sieve_machine_t mach)
 {
   long num = SIEVE_ARG (mach, 0, number);
-
   SIEVE_ADJUST (mach, 1);
+
   if (INSTR_DEBUG (mach))
     {
-      sieve_debug (mach, "%4lu: BRANCH %lu\n",
+      sieve_debug (mach, "%4lu: BRZ %lu\n",
 		   (unsigned long)(mach->pc-2),
 		   (unsigned long)(mach->pc + num));
       if (INSTR_DISASS (mach))
 	return;
     }
   
+  if (!mach->reg)
     mach->pc += num;
 }
   
 void
-instr_brz (sieve_machine_t mach)
+instr_brnz (sieve_machine_t mach)
 {
   long num = SIEVE_ARG (mach, 0, number);
   SIEVE_ADJUST (mach, 1);
 
   if (INSTR_DEBUG (mach))
     {
-      sieve_debug (mach, "%4lu: BRZ %lu\n",
+      sieve_debug (mach, "%4lu: BRNZ %lu\n",
 		   (unsigned long)(mach->pc-2),
 		   (unsigned long)(mach->pc + num));
       if (INSTR_DISASS (mach))
 	return;
     }
   
-  if (!mach->reg)
+  if (mach->reg)
     mach->pc += num;
 }