From 6c368a18680bb2d1625052f21de7eeacb640c8f1 Mon Sep 17 00:00:00 2001 From: midipix Date: Sat, 26 Jan 2019 13:46:58 -0500 Subject: psxglue.h: updated struct __psx_context to match libpsxscl. --- arch/nt32/psxglue.h | 2 +- arch/nt64/psxglue.h | 2 +- src/arch/nt32/crt_glue.c | 2 +- src/arch/nt64/crt_glue.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/nt32/psxglue.h b/arch/nt32/psxglue.h index ee9d6c4..1bf6ed3 100644 --- a/arch/nt32/psxglue.h +++ b/arch/nt32/psxglue.h @@ -38,7 +38,7 @@ struct __psx_context { int size; int options; void * refaddr; - void * libcaddr; + void * ldsoaddr; const unsigned short * ctty; void ** sys_vtbl; const struct __ldso_vtbl * ldso_vtbl; diff --git a/arch/nt64/psxglue.h b/arch/nt64/psxglue.h index ee9d6c4..1bf6ed3 100644 --- a/arch/nt64/psxglue.h +++ b/arch/nt64/psxglue.h @@ -38,7 +38,7 @@ struct __psx_context { int size; int options; void * refaddr; - void * libcaddr; + void * ldsoaddr; const unsigned short * ctty; void ** sys_vtbl; const struct __ldso_vtbl * ldso_vtbl; diff --git a/src/arch/nt32/crt_glue.c b/src/arch/nt32/crt_glue.c index c5af4b0..a28273e 100644 --- a/src/arch/nt32/crt_glue.c +++ b/src/arch/nt32/crt_glue.c @@ -66,7 +66,7 @@ void __libc_entry_routine( ctx.size = sizeof(ctx); ctx.options = options; ctx.refaddr = __main; - ctx.libcaddr = _init; + ctx.ldsoaddr = _init; ctx.ctty = __ctty; ctx.pthread_create_fn = pthread_create; ctx.pthread_surrogate_fn= __pthread_surrogate_init; diff --git a/src/arch/nt64/crt_glue.c b/src/arch/nt64/crt_glue.c index c5af4b0..a28273e 100644 --- a/src/arch/nt64/crt_glue.c +++ b/src/arch/nt64/crt_glue.c @@ -66,7 +66,7 @@ void __libc_entry_routine( ctx.size = sizeof(ctx); ctx.options = options; ctx.refaddr = __main; - ctx.libcaddr = _init; + ctx.ldsoaddr = _init; ctx.ctty = __ctty; ctx.pthread_create_fn = pthread_create; ctx.pthread_surrogate_fn= __pthread_surrogate_init; -- cgit v1.2.3