D32

include/crt0.h

@@ -68,7 +68,6 @@ char **__crt0_glob_function(char *_arg);
 
 #ifdef _IN_DJ64
 EXTERN ASM(int, _crt0_startup_flags);
-EXTERN ASM_ARR(unsigned char, dosobj_page, 4096);
 #else
 extern int _crt0_startup_flags;
 #endif

src/libc/dj64/dosobj.c

@@ -38,86 +38,29 @@
 #include <dpmi.h>
 #include <dj64/util.h>
 #include <libc/djthunks.h>
-#include <libc/djctx.h>
-#include "smalloc.h"
 #include "dosobj.h"
 
-struct dost {
-  smpool pool;
-  uint32_t base;
-  int initialized;
-};
-
-static struct dost *dst;
-DJ64_DEFINE_SWAPPABLE_CONTEXT(dost, dst)
-#define pool dst->pool
-#define base dst->base
-#define initialized dst->initialized
-
-static void err_printf(int prio, const char *fmt, ...) PRINTF(2);
-static void err_printf(int prio, const char *fmt, ...)
-{
-    va_list vl;
-
-    va_start(vl, fmt);
-    djloudvprintf(fmt, vl);
-    va_end(vl);
-}
-
-void dosobj_init(void *ptr, int size)
-{
-    assert(!initialized);
-    sminit(&pool, ptr, size);
-    smregister_error_notifier(&pool, err_printf);
-    base = PTR_DATA(ptr);
-    initialized = 1;
-}
-
-static void do_free(void)
+void dosobj_init(void)
 {
-    int leaked;
-
-    assert(initialized);
-    leaked = smdestroy(&pool);
-    assert(!leaked);
 }
 
 void dosobj_free(void)
 {
-    do_free();
-    initialized = 0;
 }
 
-void dosobj_reinit(void *ptr, int size)
+uint32_t mk_dosobj(uint32_t len)
 {
-    do_free();
-    sminit(&pool, ptr, size);
-    base = PTR_DATA(ptr);
-}
-
-uint32_t mk_dosobj(uint16_t len)
-{
-    void *ptr;
-    uint32_t offs;
-
-    assert(initialized);
-    ptr = smalloc(&pool, len);
-    if (!ptr) {
-        djloudprintf("dosobj: OOM! len=%i\n", len);
-        abort();
-    }
-    offs = (uintptr_t)ptr - (uintptr_t)smget_base_addr(&pool);
-    return base + offs;
+    return malloc32(len);
 }
 
-void pr_dosobj(uint32_t fa, const void *data, uint16_t len)
+void pr_dosobj(uint32_t fa, const void *data, uint32_t len)
 {
     void *ptr = DATA_PTR(fa);
 
     memcpy(ptr, data, len);
 }
 
-void cp_dosobj(void *data, uint32_t fa, uint16_t len)
+void cp_dosobj(void *data, uint32_t fa, uint32_t len)
 {
     void *ptr = DATA_PTR(fa);
 
@@ -126,12 +69,5 @@ void cp_dosobj(void *data, uint32_t fa, uint16_t len)
 
 void rm_dosobj(uint32_t fa)
 {
-    void *ptr = (char *)smget_base_addr(&pool) + (fa - base);
-
-    smfree(&pool, ptr);
-}
-
-void dosobj_dump(void)
-{
-    smdump(&pool);
+    free32(fa);
 }

src/libc/dj64/dosobj.h

@@ -24,13 +24,11 @@
 
 #include <stdint.h>
 
-void dosobj_init(void *ptr, int size);
-void dosobj_reinit(void *ptr, int size);
+void dosobj_init(void);
 void dosobj_free(void);
-uint32_t mk_dosobj(uint16_t len);
-void pr_dosobj(uint32_t fa, const void *data, uint16_t len);
-void cp_dosobj(void *data, uint32_t fa, uint16_t len);
+uint32_t mk_dosobj(uint32_t len);
+void pr_dosobj(uint32_t fa, const void *data, uint32_t len);
+void cp_dosobj(void *data, uint32_t fa, uint32_t len);
 void rm_dosobj(uint32_t fa);
-void dosobj_dump(void);
 
 #endif

src/libc/dj64/makefile

@@ -8,7 +8,7 @@ MP = $(P)/mkproto.sh
 GA = $(P)/gen_asms.sh
 LIBN = libdj64.so.0.2
 LIBS = libdj64_s.a
-SOURCES = thunks.c thunks_a.c thunks_c.c thunks_p.c dosobj.c smalloc.c
+SOURCES = thunks.c thunks_a.c thunks_c.c thunks_p.c dosobj.c
 OBJECTS = $(SOURCES:.c=.o)
 
 .INTERMEDIATE: thunk_syms.s thunk_syms.ss

src/libc/dj64/plt.S

@@ -409,8 +409,3 @@ dj64_plt_call:
     movl $AUX_USER, %ebx
     call_plt
     ret
-
-.bss
-
-.global _dosobj_page
-_dosobj_page: .space 4096