Skip to content

Fixes #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stsp merged 3 commits into from
Jun 16, 2026
Merged

Fixes #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
198c56f
rename __crt0_startup_flags to avoid clashes
stsp Jun 15, 2026
95f4b03
farptr: preserve EBX
stsp Jun 16, 2026
d68f35d
socket: fix USE_xx stuff
stsp Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/djdev64/djdev64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ static int _djdev64_open(const char *path, const struct dj64_api *api,
char buf[256];
int *vh1, *vh2;

snprintf(buf, sizeof(buf), "_%s", *v);
snprintf(buf, sizeof(buf), "____%s", *v);
vh1 = dlsym(dlh, *v);
vh2 = dlsym(dlh, buf);
if (vh1 && vh2)
Expand Down
4 changes: 2 additions & 2 deletions src/libc/dj64/thunks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#include "plt.h"
#include "dosobj.h"

int __crt0_startup_flags;
int _____crt0_startup_flags;

#define MAX_DISPS 5
struct udisp {
Expand Down Expand Up @@ -250,7 +250,7 @@ static ASMh(int, _crt0_startup_flags)

static void do_early_init(int handle)
{
*____crt0_startup_flags(handle) = __crt0_startup_flags;
*____crt0_startup_flags(handle) = _____crt0_startup_flags;
}

static int dj64_ctrl(int handle, int libid, int fn, unsigned esi, uint8_t *sp)
Expand Down
1 change: 1 addition & 0 deletions src/libc/pc_hw/farptr/farptr.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#define USE_EBX
#include <libc/asmdefs.h>

.macro farpoke sz,rg
Expand Down
1 change: 1 addition & 0 deletions src/libc/pc_hw/farptr/farptr_gs.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#define USE_EBX
#include <libc/asmdefs.h>

.macro farpoke sz,rg
Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_accept.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EDX
#define USE_EDI
#define USE_EAX
#define USE_ESI
#define USE_ECX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_bind.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EDX
#define USE_EDI
#define USE_EAX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_close.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <libc/asmdefs.h>
#define USE_EDI
#define USE_EAX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_connct.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EDX
#define USE_EDI
#define USE_EAX
#define USE_ESI
#define USE_ECX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_fnread.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_ECX
#define USE_EDI
#define USE_EAX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_geterr.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EDX
#define USE_EDI
#define USE_EAX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_gnblk.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_ECX
#define USE_EDX
#define USE_EDI
#define USE_EAX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_gprnm.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EDI
#define USE_EAX
#define USE_ECX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_gscknm.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EDI
#define USE_EAX
#define USE_ECX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_initnt.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EDI
#define USE_ESI
#define USE_EAX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_listen.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <libc/asmdefs.h>
#define USE_EDI
#define USE_EAX
#define USE_ECX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_recv.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EDX
#define USE_EDI
#define USE_EAX
#define USE_ESI
#define USE_ECX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_recvfr.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EDX
#define USE_EDI
#define USE_EAX
#define USE_ESI
#define USE_ECX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_select.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EDX
#define USE_EDI
#define USE_EAX
#define USE_ESI
#define USE_ECX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_send.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EDI
#define USE_EAX
#define USE_ESI
#define USE_ECX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_sendto.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EDX
#define USE_EDI
#define USE_EAX
#define USE_ESI
#define USE_ECX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_snblk.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EDX
#define USE_EDI
#define USE_EAX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_socket.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EDI
#define USE_EAX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/s_soling.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_ECX
#define USE_EDX
#define USE_EDI
#define USE_EAX
#include <libc/asmdefs.h>

.text

Expand Down
2 changes: 1 addition & 1 deletion src/libc/posix/socket/csock/vxd.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <libc/asmdefs.h>
#define USE_EBX
#define USE_EAX
#define USE_EDI
#define USE_ESI
#include <libc/asmdefs.h>

.data

Expand Down
Loading