diff --git a/arch/nt32/psxdbg.h b/arch/nt32/psxdbg.h deleted file mode 100644 index ef59445..0000000 --- a/arch/nt32/psxdbg.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef _PSXDBG_H_ -#define _PSXDBG_H_ - -struct __dbg_event; - -struct __dbg_vtbl { - int (*dbg_attach)(pid_t); - int (*dbg_detach)(int); - - int (*dbg_spawn)(const char *, char **, char **); - int (*dbg_fork)(void); - int (*dbg_suspend)(int); - int (*dbg_kill)(int); - - int (*dbg_rbreak)(int); - int (*dbg_tbreak)(int); - int (*dbg_lbreak)(int); - - int (*dbg_event_query_one)(int, struct __dbg_event *); - int (*dbg_event_query_all)(int, struct __dbg_event *, int); - - int (*dbg_event_acquire)(int, struct __dbg_event *); - int (*dbg_event_respond)(int, struct __dbg_event *); - - int (*dbg_query_cpid)(int); - int (*dbg_query_syspid)(int); - - int (*dbg_common_error)(void); - int (*dbg_native_error)(void); -}; - -#endif diff --git a/arch/nt32/psxglue.h b/arch/nt32/psxglue.h index 2643328..1ddd536 100644 --- a/arch/nt32/psxglue.h +++ b/arch/nt32/psxglue.h @@ -46,7 +46,6 @@ struct __psx_context { void ** sys_vtbl; const struct __psx_vtbl * psx_vtbl; const struct __seh_vtbl * seh_vtbl; - const struct __dbg_vtbl * dbg_vtbl; const struct __ldso_vtbl * ldso_vtbl; unsigned int teb_sys_idx; unsigned int teb_libc_idx; diff --git a/arch/nt64/psxdbg.h b/arch/nt64/psxdbg.h deleted file mode 100644 index ef59445..0000000 --- a/arch/nt64/psxdbg.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef _PSXDBG_H_ -#define _PSXDBG_H_ - -struct __dbg_event; - -struct __dbg_vtbl { - int (*dbg_attach)(pid_t); - int (*dbg_detach)(int); - - int (*dbg_spawn)(const char *, char **, char **); - int (*dbg_fork)(void); - int (*dbg_suspend)(int); - int (*dbg_kill)(int); - - int (*dbg_rbreak)(int); - int (*dbg_tbreak)(int); - int (*dbg_lbreak)(int); - - int (*dbg_event_query_one)(int, struct __dbg_event *); - int (*dbg_event_query_all)(int, struct __dbg_event *, int); - - int (*dbg_event_acquire)(int, struct __dbg_event *); - int (*dbg_event_respond)(int, struct __dbg_event *); - - int (*dbg_query_cpid)(int); - int (*dbg_query_syspid)(int); - - int (*dbg_common_error)(void); - int (*dbg_native_error)(void); -}; - -#endif diff --git a/arch/nt64/psxglue.h b/arch/nt64/psxglue.h index 2643328..1ddd536 100644 --- a/arch/nt64/psxglue.h +++ b/arch/nt64/psxglue.h @@ -46,7 +46,6 @@ struct __psx_context { void ** sys_vtbl; const struct __psx_vtbl * psx_vtbl; const struct __seh_vtbl * seh_vtbl; - const struct __dbg_vtbl * dbg_vtbl; const struct __ldso_vtbl * ldso_vtbl; unsigned int teb_sys_idx; unsigned int teb_libc_idx; diff --git a/project/arch.mk b/project/arch.mk index de179c0..858c1f0 100644 --- a/project/arch.mk +++ b/project/arch.mk @@ -31,7 +31,6 @@ install-headers: install-target-sys-headers headers.tag: $(PROJECT_DIR)/arch/$(ARCH)/atomic.h headers.tag: $(PROJECT_DIR)/arch/$(ARCH)/peldso.h -headers.tag: $(PROJECT_DIR)/arch/$(ARCH)/psxdbg.h headers.tag: $(PROJECT_DIR)/arch/$(ARCH)/psxglue.h headers.tag: $(PROJECT_DIR)/arch/$(ARCH)/psxseh.h diff --git a/src/arch/nt32/crt_glue.c b/src/arch/nt32/crt_glue.c index 16eaba9..ccebd64 100644 --- a/src/arch/nt32/crt_glue.c +++ b/src/arch/nt32/crt_glue.c @@ -11,7 +11,6 @@ volatile int __thread_list_lock; extern const struct __ldso_vtbl * __ldso_vtbl; extern const struct __psx_vtbl * __psx_vtbl; extern const struct __seh_vtbl * __eh_vtbl; -extern const struct __dbg_vtbl * __db_vtbl; static int __pthread_surrogate_init(struct pthread * self); @@ -105,7 +104,6 @@ void __libc_entry_routine( __ldso_vtbl = ctx.ldso_vtbl; __psx_vtbl = ctx.psx_vtbl; __eh_vtbl = ctx.seh_vtbl; - __db_vtbl = ctx.dbg_vtbl; __teb_sys_idx = ctx.teb_sys_idx; __teb_libc_idx = ctx.teb_libc_idx; diff --git a/src/arch/nt32/vtbl.c b/src/arch/nt32/vtbl.c index 8a0412f..ad0a0e9 100644 --- a/src/arch/nt32/vtbl.c +++ b/src/arch/nt32/vtbl.c @@ -6,7 +6,6 @@ const struct __ldso_vtbl * __ldso_vtbl = 0; const struct __psx_vtbl * __psx_vtbl = 0; const struct __seh_vtbl * __eh_vtbl = 0; -const struct __dbg_vtbl * __db_vtbl = 0; unsigned long ** __syscall_vtbl = 0; unsigned long __teb_sys_idx = 0; diff --git a/src/arch/nt64/crt_glue.c b/src/arch/nt64/crt_glue.c index 16eaba9..ccebd64 100644 --- a/src/arch/nt64/crt_glue.c +++ b/src/arch/nt64/crt_glue.c @@ -11,7 +11,6 @@ volatile int __thread_list_lock; extern const struct __ldso_vtbl * __ldso_vtbl; extern const struct __psx_vtbl * __psx_vtbl; extern const struct __seh_vtbl * __eh_vtbl; -extern const struct __dbg_vtbl * __db_vtbl; static int __pthread_surrogate_init(struct pthread * self); @@ -105,7 +104,6 @@ void __libc_entry_routine( __ldso_vtbl = ctx.ldso_vtbl; __psx_vtbl = ctx.psx_vtbl; __eh_vtbl = ctx.seh_vtbl; - __db_vtbl = ctx.dbg_vtbl; __teb_sys_idx = ctx.teb_sys_idx; __teb_libc_idx = ctx.teb_libc_idx; diff --git a/src/arch/nt64/vtbl.c b/src/arch/nt64/vtbl.c index 8a0412f..ad0a0e9 100644 --- a/src/arch/nt64/vtbl.c +++ b/src/arch/nt64/vtbl.c @@ -6,7 +6,6 @@ const struct __ldso_vtbl * __ldso_vtbl = 0; const struct __psx_vtbl * __psx_vtbl = 0; const struct __seh_vtbl * __eh_vtbl = 0; -const struct __dbg_vtbl * __db_vtbl = 0; unsigned long ** __syscall_vtbl = 0; unsigned long __teb_sys_idx = 0;