--- gforth/engine/profile.c	2001/03/18 10:33:25	1.5
+++ gforth/engine/profile.c	2003/08/25 14:17:52	1.10
@@ -1,6 +1,6 @@
 /* VM profiling support stuff
 
-  Copyright (C) 2001 Free Software Foundation, Inc.
+  Copyright (C) 2001,2002,2003 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
@@ -20,10 +20,10 @@
 */
 
 #include "config.h"
+#include "forth.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
-#include "forth.h"
 
 
 /* data structure: simple hash table with external chaining */
@@ -85,9 +85,9 @@ void vm_count_block(Xt *ip)
 }
 
 #ifdef DIRECT_THREADED
-#define VM_IS_INST(inst, n) ((inst) == vm_prims[(n)+DOESJUMP+1])
+#define VM_IS_INST(inst, n) ((inst) == vm_prims[n])
 #else
-#define VM_IS_INST(inst, n) ((inst) == &(vm_prims[(n)+DOESJUMP+1]))
+#define VM_IS_INST(inst, n) ((inst) == &(vm_prims[n]))
 #endif
 
 void postprocess_block(block_count *b)
@@ -129,6 +129,7 @@ void postprocess(void)
 }
 
 #if 0
+/* full basic blocks only */
 void print_block(FILE *file, block_count *b)
 {
   size_t i;
@@ -138,8 +139,21 @@ void print_block(FILE *file, block_count
     fprintf(file, "%s ", b->insts[i]);
   putc('\n', file);
 }
-#endif
+#elif 0
+/* full basic blocks and all their prefixes */
+void print_block(FILE *file, block_count *b)
+{
+  size_t i,j;
 
+  for (j=1; j<=b->ninsts; j++) {
+    fprintf(file,"%14lld\t",b->count);
+    for (i=0; i<j; i++)
+      fprintf(file, "%s ", b->insts[i]);
+    putc('\n', file);
+  }
+}
+#else
+/* all subsequences up to length 12 */
 void print_block(FILE *file, block_count *b)
 {
   size_t i,j,k;
@@ -152,6 +166,7 @@ void print_block(FILE *file, block_count
       putc('\n', file);
     }
 }
+#endif
 
 void vm_print_profile(FILE *file)
 {