Signed-off-by: Vegard Nossum <vegard.nos...@gmail.com>
---
vm/itable.c | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/vm/itable.c b/vm/itable.c
index a544c9b..83ede3e 100644
--- a/vm/itable.c
+++ b/vm/itable.c
@@ -35,6 +35,7 @@
#include "vm/object.h"
#include "vm/itable.h"
#include "vm/method.h"
+#include "vm/trace.h"
bool opt_trace_itable;
@@ -193,25 +194,28 @@ static void *itable_create_conflict_resolver(struct
vm_class *vmc,
static void trace_itable(struct vm_class *vmc, struct list_head *itable)
{
- printf("trace itable: %s\n", vmc->name);
+ trace_printf("trace itable: %s\n", vmc->name);
for (unsigned int i = 0; i < VM_ITABLE_SIZE; ++i) {
if (list_is_empty(&itable[i]))
continue;
- printf(" %d: ", i);
+ trace_printf(" %d:\n", i);
struct itable_entry *entry;
list_for_each_entry(entry, &itable[i], node) {
- struct vm_method *vmm = entry->i_method;
+ struct vm_method *i_vmm = entry->i_method;
+ struct vm_method *c_vmm = entry->c_method;
- printf("%s.%s%s%s",
- vmm->class->name, vmm->name, vmm->type,
- &entry->node == list_last(&itable[i])
- ? "" : ", ");
- }
+ assert(vm_class_is_interface(i_vmm->class));
+ assert(!vm_class_is_interface(c_vmm->class));
+ assert(!strcmp(c_vmm->name, i_vmm->name));
+ assert(!strcmp(c_vmm->type, i_vmm->type));
- printf("\n");
+ trace_printf(" * %s.%s%s -> %s\n",
+ i_vmm->class->name, i_vmm->name, i_vmm->type,
+ c_vmm->class->name);
+ }
}
}
@@ -229,9 +233,6 @@ int vm_itable_setup(struct vm_class *vmc)
itable_add_entries(vmc, itable);
- if (opt_trace_itable)
- trace_itable(vmc, itable);
-
for (unsigned int i = 0; i < VM_ITABLE_SIZE; ++i) {
struct itable_entry *entry;
@@ -249,6 +250,9 @@ int vm_itable_setup(struct vm_class *vmc)
}
}
+ if (opt_trace_itable)
+ trace_itable(vmc, itable);
+
for (unsigned int i = 0; i < VM_ITABLE_SIZE; ++i) {
vmc->itable[i]
= itable_create_conflict_resolver(vmc, &itable[i]);
--
1.6.0.4
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
