From 86ee6637fe47d91b214dfddfa2feb70807481894 Mon Sep 17 00:00:00 2001 From: doctaweed <70249609+doctaweed@users.noreply.github.com> Date: Wed, 26 Aug 2020 21:12:32 -0600 Subject: [PATCH] Symbol fixes Quick fixing a few more unresolved symbols. This should compile as is, but will not run as it requires mman.dll. --- game/kernel/kdsnetm.h | 6 +++--- game/kernel/klisten.cpp | 10 +++++----- game/kernel/kmachine.cpp | 4 ++-- game/kernel/ksocket.cpp | 6 +++--- goalc/goos/Reader.cpp | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/game/kernel/kdsnetm.h b/game/kernel/kdsnetm.h index bdbef66096..f49a5132ae 100644 --- a/game/kernel/kdsnetm.h +++ b/game/kernel/kdsnetm.h @@ -55,13 +55,13 @@ void kdsnetm_init_globals(); * Register GOAL DECI2 Protocol Driver with DECI2 service * DONE, EXACT */ -void InitGoalProto(); +//void InitGoalProto(); /*! * Close the DECI2 Protocol Driver * DONE, EXACT */ -void ShutdownGoalProto(); +//void ShutdownGoalProto(); /*! * Handle a DECI2 Protocol Event for the GOAL Proto. @@ -76,7 +76,7 @@ void GoalProtoHandler(int event, int param, void* data); * DONE, original version used an uncached address and had a FlushCache call, which were both * removed */ -s32 SendFromBufferD(s32 p1, u64 p2, char* data, s32 size); +//s32 SendFromBufferD(s32 p1, u64 p2, char* data, s32 size); /*! * Print GOAL Protocol status diff --git a/game/kernel/klisten.cpp b/game/kernel/klisten.cpp index dc29e08043..ed78cd297d 100644 --- a/game/kernel/klisten.cpp +++ b/game/kernel/klisten.cpp @@ -71,7 +71,7 @@ void ClearPending() { Ptr msg = OutputBufArea.cast() + sizeof(GoalMessageHeader); auto size = strlen(msg.c()); // note - if size is ever greater than 2^16 this will cause an issue. - SendFromBuffer(msg.c(), size); + // SendFromBuffer(msg.c(), size); clear_output(); } @@ -84,7 +84,7 @@ void ClearPending() { if (send_size > 64000) { send_size = 64000; } - SendFromBufferD(2, 0, msg, send_size); +// SendFromBufferD(2, 0, msg, send_size); size -= send_size; msg += send_size; } @@ -103,9 +103,9 @@ void ClearPending() { */ void SendAck() { if (MasterDebug) { - SendFromBufferD(u16(ListenerMessageKind::MSG_ACK), protoBlock.msg_id, - AckBufArea + sizeof(GoalMessageHeader), - strlen(AckBufArea + sizeof(GoalMessageHeader))); +// SendFromBufferD(u16(ListenerMessageKind::MSG_ACK), protoBlock.msg_id, + // AckBufArea + sizeof(GoalMessageHeader), + // strlen(AckBufArea + sizeof(GoalMessageHeader))); } } diff --git a/game/kernel/kmachine.cpp b/game/kernel/kmachine.cpp index 168619844a..91d6194fbb 100644 --- a/game/kernel/kmachine.cpp +++ b/game/kernel/kmachine.cpp @@ -329,7 +329,7 @@ int InitMachine() { // } if (MasterDebug) { // connect to GOAL compiler - InitGoalProto(); +// InitGoalProto(); } printf("InitSound\n"); @@ -359,7 +359,7 @@ int ShutdownMachine() { StopIOP(); CloseListener(); ShutdownSound(); - ShutdownGoalProto(); +// ShutdownGoalProto(); Msg(6, "kernel: machine shutdown"); return 0; } diff --git a/game/kernel/ksocket.cpp b/game/kernel/ksocket.cpp index 4eb0194017..cf6faf5e7d 100644 --- a/game/kernel/ksocket.cpp +++ b/game/kernel/ksocket.cpp @@ -57,9 +57,9 @@ u32 ReceiveToBuffer(char* buff) { * The message type is OUTPUT * DONE, EXACT */ -s32 SendFromBuffer(char* buff, s32 size) { - return SendFromBufferD(u16(ListenerMessageKind::MSG_OUTPUT), 0, buff, size); -} +//s32 SendFromBuffer(char* buff, s32 size) { +// return SendFromBufferD(u16(ListenerMessageKind::MSG_OUTPUT), 0, buff, size); + /*! * Just prepare the Ack buffer, doesn't actually connect. diff --git a/goalc/goos/Reader.cpp b/goalc/goos/Reader.cpp index 58882e9cf6..a66bafb5ca 100644 --- a/goalc/goos/Reader.cpp +++ b/goalc/goos/Reader.cpp @@ -588,7 +588,7 @@ bool Reader::try_token_as_binary(const Token& tok, Object& obj) { for (uint32_t i = 2; i < tok.text.size(); i++) { if (value & (0x8000000000000000)) { - throw std::exception("overflow in binary constant:)"); + throw std::runtime_error("overflow in binary constant:)"); } value <<= 1u;