Signed-off-by: Tomek Grabiec <[email protected]>
---
arch/x86/emit-code.c | 2 +-
arch/x86/exception.c | 2 +-
arch/x86/signal.c | 2 +-
arch/x86/unwind_32.S | 2 +-
arch/x86/unwind_64.S | 2 +-
include/jit/cu-mapping.h | 2 +-
include/jit/exception.h | 2 +-
jit/cu-mapping.c | 2 +-
jit/trace-jit.c | 2 +-
vm/signal.c | 2 +-
vm/stack-trace.c | 4 ++--
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/x86/emit-code.c b/arch/x86/emit-code.c
index 7454d4e..f6894a5 100644
--- a/arch/x86/emit-code.c
+++ b/arch/x86/emit-code.c
@@ -1247,7 +1247,7 @@ void fixup_static_at(unsigned long addr)
struct compilation_unit *cu;
struct static_fixup_site *this;
- cu = get_cu_from_native_addr(addr);
+ cu = jit_lookup_cu(addr);
assert(cu);
list_for_each_entry(this, &cu->static_fixup_site_list, cu_node)
diff --git a/arch/x86/exception.c b/arch/x86/exception.c
index 1323272..3902d1b 100644
--- a/arch/x86/exception.c
+++ b/arch/x86/exception.c
@@ -63,7 +63,7 @@ void throw_exception_from_signal(void *ctx, struct vm_object
*exception)
uc = ctx;
source_addr = uc->uc_mcontext.gregs[REG_IP];
- cu = get_cu_from_native_addr(source_addr);
+ cu = jit_lookup_cu(source_addr);
frame = (struct jit_stack_frame*)uc->uc_mcontext.gregs[REG_BP];
eh = throw_exception_from(cu, frame, (unsigned char*)source_addr);
diff --git a/arch/x86/signal.c b/arch/x86/signal.c
index 93b00f5..7015552 100644
--- a/arch/x86/signal.c
+++ b/arch/x86/signal.c
@@ -48,7 +48,7 @@ struct compilation_unit *get_signal_source_cu(void *ctx)
ucontext_t *uc;
uc = ctx;
- return get_cu_from_native_addr(uc->uc_mcontext.gregs[REG_IP]);
+ return jit_lookup_cu(uc->uc_mcontext.gregs[REG_IP]);
}
/**
diff --git a/arch/x86/unwind_32.S b/arch/x86/unwind_32.S
index 85a3794..146961a 100644
--- a/arch/x86/unwind_32.S
+++ b/arch/x86/unwind_32.S
@@ -15,7 +15,7 @@ unwind:
* Lookup pointer to compilation unit.
*/
push %edx
- call get_cu_from_native_addr
+ call jit_lookup_cu
movl %eax, %ecx
pop %edx
diff --git a/arch/x86/unwind_64.S b/arch/x86/unwind_64.S
index da2c521..fc02857 100644
--- a/arch/x86/unwind_64.S
+++ b/arch/x86/unwind_64.S
@@ -15,7 +15,7 @@ unwind:
* Lookup pointer to compilation unit.
*/
push %rdx
- call get_cu_from_native_addr
+ call jit_lookup_cu
movq %rax, %rcx
pop %rdx
diff --git a/include/jit/cu-mapping.h b/include/jit/cu-mapping.h
index 357bb20..6395fc8 100644
--- a/include/jit/cu-mapping.h
+++ b/include/jit/cu-mapping.h
@@ -5,7 +5,7 @@ struct compilation_unit;
int add_cu_mapping(unsigned long addr, struct compilation_unit *cu);
void remove_cu_mapping(unsigned long addr);
-struct compilation_unit *get_cu_from_native_addr(unsigned long addr);
+struct compilation_unit *jit_lookup_cu(unsigned long addr);
void init_cu_mapping();
#endif
diff --git a/include/jit/exception.h b/include/jit/exception.h
index 1c27d39..ca31cd5 100644
--- a/include/jit/exception.h
+++ b/include/jit/exception.h
@@ -95,7 +95,7 @@ static inline struct vm_object *exception_occurred(void)
\
frame = __builtin_frame_address(1); \
\
- cu = get_cu_from_native_addr((unsigned long)native_ptr); \
+ cu = jit_lookup_cu((unsigned long)native_ptr); \
eh = throw_exception_from(cu, frame, native_ptr); \
\
__override_return_address(eh); \
diff --git a/jit/cu-mapping.c b/jit/cu-mapping.c
index 3f9e3fc..ba356f2 100644
--- a/jit/cu-mapping.c
+++ b/jit/cu-mapping.c
@@ -72,7 +72,7 @@ void remove_cu_mapping(unsigned long addr)
pthread_rwlock_unlock(&cu_map_rwlock);
}
-struct compilation_unit *get_cu_from_native_addr(unsigned long addr)
+struct compilation_unit *jit_lookup_cu(unsigned long addr)
{
struct compilation_unit *cu;
diff --git a/jit/trace-jit.c b/jit/trace-jit.c
index fa3a75b..6337fef 100644
--- a/jit/trace-jit.c
+++ b/jit/trace-jit.c
@@ -353,7 +353,7 @@ static void trace_return_address(struct jit_stack_frame
*frame)
struct vm_method *vmm;
struct vm_class *vmc;
- cu = get_cu_from_native_addr(frame->return_address);
+ cu = jit_lookup_cu(frame->return_address);
if (!cu) {
printf(" (no compilation unit mapping)\n");
return;
diff --git a/vm/signal.c b/vm/signal.c
index fb4e09d..e5b9eaf 100644
--- a/vm/signal.c
+++ b/vm/signal.c
@@ -55,7 +55,7 @@ throw_from_signal_bh(unsigned long jit_addr)
*/
frame = __builtin_frame_address(3);
- cu = get_cu_from_native_addr(jit_addr);
+ cu = jit_lookup_cu(jit_addr);
return (unsigned long)throw_exception_from(cu, frame,
(unsigned char *)jit_addr);
diff --git a/vm/stack-trace.c b/vm/stack-trace.c
index eb08ddd..7cc9555 100644
--- a/vm/stack-trace.c
+++ b/vm/stack-trace.c
@@ -191,7 +191,7 @@ int skip_frames_from_class(struct stack_trace_elem *elem,
struct vm_class *class
struct compilation_unit *cu;
do {
- cu = get_cu_from_native_addr(elem->addr);
+ cu = jit_lookup_cu(elem->addr);
if (cu == NULL) {
fprintf(stderr,
"%s: no compilation unit mapping for %p\n",
@@ -260,7 +260,7 @@ struct vm_object *get_stack_trace(struct stack_trace_elem
*st_elem)
do {
unsigned long bc_offset;
- cu = get_cu_from_native_addr(st_elem->addr);
+ cu = jit_lookup_cu(st_elem->addr);
if (!cu) {
fprintf(stderr,
"%s: no compilation unit mapping for %p\n",
--
1.6.0.6
------------------------------------------------------------------------------
_______________________________________________
Jatovm-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
