Index: /branches/working-0711/ccl/lisp-kernel/ppc-constants.s =================================================================== --- /branches/working-0711/ccl/lisp-kernel/ppc-constants.s (revision 12986) +++ /branches/working-0711/ccl/lisp-kernel/ppc-constants.s (revision 12987) @@ -189,6 +189,6 @@ _node(initial_tcr) /* initial thread tcr */ _node(image_name) /* --image-name argument */ - _node(BADfpscr_save_high) /* high word of FP reg used to save FPSCR */ - _node(BADfpscr_save) /* saved FPSCR */ + _node(BADfpscr_save_high) /* high word of FP reg used to save FPSCR */ + _node(unwind_resume) /* _Unwind_Resume */ _node(batch_flag) /* -b */ _node(host_platform) /* for runtime platform-specific stuff */ @@ -201,5 +201,5 @@ _node(double_float_one) /* high half of 1.0d0 */ _node(short_float_zero) /* low half of 1.0d0 */ - _node(doh_head) /* creole objects header */ + _node(objc2_end_catch) /* objc_end_catch() */ _node(metering_info) /* address of lisp_metering global */ _node(in_gc) /* non-zero when GC active */ @@ -207,7 +207,7 @@ _node(lexpr_return) /* magic &lexpr return code. */ _node(all_areas) /* doubly-linked list of all memory areas */ - _node(BAD_cs_overflow_limit) /* limit for control-stack overflow check */ - _node(kernel_name) /* real executable name */ - _node(BAD_current_vs) /* current value-stack area */ + _node(kernel_path) /* real executable name */ + _node(objc2_begin_catch) /* objc_begin_catch */ + _node(BAD_current_vs) /* current value-stack area */ _node(statically_linked) /* non-zero if -static */ _node(heap_end) /* end of lisp heap */ @@ -230,5 +230,5 @@ _node(saveR13) /* probably don]t really need this */ _node(saveTOC) /* where the 68K emulator stores the emulated regs */ - _node(tcr_lock) /* this thread]s exception frame chain */ + _node(objc_2_personality) /* exception "personality routine" address for ObjC 2.0 */ _node(kernel_imports) /* some things we need imported for us */ _node(interrupt_signal) /* signal used by PROCESS-INTERRUPT */ Index: /branches/working-0711/ccl/lisp-kernel/ppc-exceptions.c =================================================================== --- /branches/working-0711/ccl/lisp-kernel/ppc-exceptions.c (revision 12986) +++ /branches/working-0711/ccl/lisp-kernel/ppc-exceptions.c (revision 12987) @@ -1852,9 +1852,4 @@ xframe_list xframe_link; -#ifdef DARWIN - if (running_under_rosetta) { - fprintf(dbgout, "signal handler: signal = %d, pc = 0x%08x\n", signum, xpPC(context)); - } -#endif if (!use_mach_exception_handling) { Index: /branches/working-0711/ccl/lisp-kernel/ppc-spentry.s =================================================================== --- /branches/working-0711/ccl/lisp-kernel/ppc-spentry.s (revision 12986) +++ /branches/working-0711/ccl/lisp-kernel/ppc-spentry.s (revision 12987) @@ -1,3 +1,3 @@ -/* Copyright (C) 1994-2001 Digitool, Inc */ + /* Copyright (C) 1994-2001 Digitool, Inc */ /* This file is part of OpenMCL. */ @@ -1577,6 +1577,101 @@ __(mtxer rzero) __(mtctr rzero) - __(blr) - + __ifdef([PPC64]) + __ifdef([DARWIN]) + __(li imm3,1<pending_io_info = NULL; if (wait_result == WAIT_OBJECT_0) { @@ -367,4 +370,91 @@ } } + +ssize_t +pipe_read(HANDLE hfile, void *buf, unsigned int count) +{ + DWORD navail, err;; + + do { + navail = 0; + if (PeekNamedPipe(hfile, NULL, 0, NULL, &navail, NULL) == 0) { + err = GetLastError(); + if (err = ERROR_HANDLE_EOF) { + return 0; + } else { + _dosmaperr(err); + return -1; + } + } + if (navail != 0) { + return lisp_standard_read(hfile, buf, count); + } + if (SleepEx(50, TRUE) == WAIT_IO_COMPLETION) { + errno = EINTR; + return -1; + } + } while (1); +} + +ssize_t +console_read(HANDLE hfile, void *buf, unsigned int count) +{ + DWORD err, eventcount, i, n; + INPUT_RECORD ir; + + do { + err = WaitForSingleObjectEx(hfile, INFINITE, TRUE); + switch (err) { + case WAIT_OBJECT_0: + eventcount = 0; + GetNumberOfConsoleInputEvents(hfile, &eventcount); + for (i = 0; i < eventcount; i++) { + PeekConsoleInput(hfile, &ir, 1, &n); + if (ir.EventType == KEY_EVENT) { + return lisp_standard_read(hfile, buf, count); + } else { + ReadConsoleInput(hfile, &ir, 1, &n); + } + } + break; + case WAIT_IO_COMPLETION: + errno = EINTR; + return -1; + break; + case WAIT_FAILED: + _dosmaperr(GetLastError()); + return -1; + break; + } + } while (1); +} + +ssize_t +lisp_read(HANDLE hfile, void *buf, unsigned int count) { + switch(GetFileType(hfile)) { + case FILE_TYPE_CHAR: + return console_read(hfile, buf, count); + break; + + case FILE_TYPE_PIPE: /* pipe or one of these newfangled socket things */ + { + int socktype, optlen = sizeof(int); + if ((getsockopt((SOCKET)hfile, SOL_SOCKET, SO_TYPE, (char *)&socktype, &optlen) != 0) && (GetLastError() == WSAENOTSOCK)) { + return pipe_read(hfile, buf, count); + } + } + /* It's a socket, fall through */ + + case FILE_TYPE_DISK: + return lisp_standard_read(hfile, buf, count); + break; + + default: + errno = EBADF; + return -1; + } +} + + ssize_t @@ -618,7 +708,7 @@ GetSystemTimeAsFileTime((FILETIME*)&now); now -= UNIX_EPOCH_IN_WINDOWS_EPOCH; - now /= 10000; + now /= 10000; /* convert time to milliseconds */ tp->tv_sec = now/1000LL; - tp->tv_usec = now%1000LL; + tp->tv_usec = 1000 * (now%1000LL); /* convert milliseconds to microseconds */ return 0; }