From 48e776232c602c102e51de36f48b43e64f3ef912 Mon Sep 17 00:00:00 2001 From: "J.T. Conklin" Date: Fri, 18 Nov 1994 21:57:22 +0000 Subject: [PATCH] * nlm/alpha.c (strtol): Removed, it is provided by NetWare C library. * nlm/gdbserve.def (strtol): Added to import list. * nlm/fake_aio.c: Removed file, no longer used. --- gdb/ChangeLog | 5 +- gdb/nlm/.Sanitize | 1 - gdb/nlm/alpha.c | 149 --------------------------------------------------- gdb/nlm/fake_aio.c | 76 -------------------------- gdb/nlm/gdbserve.def | 1 + 5 files changed, 5 insertions(+), 227 deletions(-) delete mode 100644 gdb/nlm/fake_aio.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7c4d3db..3118221 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,7 +1,10 @@ Fri Nov 18 10:38:12 1994 J.T. Conklin - * Makefile.in (LD_FOR_TARGET, NLMCONV_FOR_TARGET): Removed. + * nlm/alpha.c (strtol): Removed, it is provided by NetWare C library. + * nlm/gdbserve.def (strtol): Added to import list. + * nlm/fake_aio.c: Removed file, no longer used. + * Makefile.in (LD_FOR_TARGET, NLMCONV_FOR_TARGET): Removed. * nlm/Makefile.in (gdbserve.O): Link with ${CC_FOR_TARGET}. (LD_FOR_TARGET): Removed. diff --git a/gdb/nlm/.Sanitize b/gdb/nlm/.Sanitize index 42e1d24..5af69a4 100644 --- a/gdb/nlm/.Sanitize +++ b/gdb/nlm/.Sanitize @@ -31,7 +31,6 @@ alpha.c alpha.h altdebug.h configure.in -fake_aio.c gdbserve.c gdbserve.def i386.c diff --git a/gdb/nlm/alpha.c b/gdb/nlm/alpha.c index 3c027af..461d16b 100644 --- a/gdb/nlm/alpha.c +++ b/gdb/nlm/alpha.c @@ -323,152 +323,3 @@ Breakpoint (int __arg) fprintf (stderr, "Breakpoint() stubbed out\n"); exit (1); } - -/* - * strtol : convert a string to long. - * - * Andy Wilson, 2-Oct-89. - */ - -/* FIXME: It'd be nice to configure around these, but the include files are too - painful. These macros should at least be more portable than hardwired hex - constants. */ - -#define ULONG_MAX ((unsigned long)(~0L)) /* 0xFFFFFFFF */ -#define LONG_MAX ((long)(ULONG_MAX >> 1)) /* 0x7FFFFFFF */ -#define LONG_MIN ((long)(~LONG_MAX)) /* 0x80000000 */ - -extern int errno; - -long -strtol(s, ptr, base) - CONST char *s; char **ptr; int base; -{ - extern unsigned long strtoul(); - int minus=0; - unsigned long tmp; - CONST char *start=s; - char *eptr; - - if (s==NULL) - { - errno = ERANGE; - if (!ptr) - *ptr = (char *)start; - return 0L; - } - while (isspace(*s)) - s++; - if (*s == '-') { - s++; - minus = 1; - } - else if (*s == '+') - s++; - - /* - * let strtoul do the hard work. - */ - tmp = strtoul(s, &eptr, base); - if (ptr != NULL) - *ptr = (char *)((eptr==s) ? (char *)start : eptr); - if (tmp > (minus ? - (unsigned long) LONG_MIN : (unsigned long) LONG_MAX)) - { - errno = ERANGE; - return (minus ? LONG_MIN : LONG_MAX); - } - return (minus ? (long) -tmp : (long) tmp); -} - -/* - * strtol : convert a string to long. - * - * Andy Wilson, 2-Oct-89. - */ - -#ifndef ULONG_MAX -#define ULONG_MAX ((unsigned long)(~0L)) /* 0xFFFFFFFF */ -#endif - -extern int errno; - -unsigned long -strtoul(s, ptr, base) - CONST char *s; char **ptr; int base; -{ - unsigned long total = 0; - unsigned digit; - CONST char *start=s; - int did_conversion=0; - int overflow = 0; - int negate = 0; - unsigned long maxdiv, maxrem; - - if (s==NULL) - { - errno = ERANGE; - if (!ptr) - *ptr = (char *)start; - return 0L; - } - - while (isspace(*s)) - s++; - if (*s == '+') - s++; - else if (*s == '-') - s++, negate = 1; - if (base==0 || base==16) /* the 'base==16' is for handling 0x */ - { - int tmp; - - /* - * try to infer base from the string - */ - if (*s != '0') - tmp = 10; /* doesn't start with 0 - assume decimal */ - else if (s[1] == 'X' || s[1] == 'x') - tmp = 16, s += 2; /* starts with 0x or 0X - hence hex */ - else - tmp = 8; /* starts with 0 - hence octal */ - if (base==0) - base = (int)tmp; - } - - maxdiv = ULONG_MAX / base; - maxrem = ULONG_MAX % base; - - while ((digit = *s) != '\0') - { - if (digit >= '0' && digit < ('0'+base)) - digit -= '0'; - else - if (base > 10) - { - if (digit >= 'a' && digit < ('a'+(base-10))) - digit = digit - 'a' + 10; - else if (digit >= 'A' && digit < ('A'+(base-10))) - digit = digit - 'A' + 10; - else - break; - } - else - break; - did_conversion = 1; - if (total > maxdiv - || (total == maxdiv && digit > maxrem)) - overflow = 1; - total = (total * base) + digit; - s++; - } - if (overflow) - { - errno = ERANGE; - if (ptr != NULL) - *ptr = (char *)s; - return (ULONG_MAX); - } - if (ptr != NULL) - *ptr = (char *) ((did_conversion) ? (char *)s : (char *)start); - return negate ? -total : total; -} diff --git a/gdb/nlm/fake_aio.c b/gdb/nlm/fake_aio.c deleted file mode 100644 index 91cc7d5..0000000 --- a/gdb/nlm/fake_aio.c +++ /dev/null @@ -1,76 +0,0 @@ -#include -#include -#include -#include - -#define CONST const - -/* This file provides stubs and equivalent interfaces for all functions that - the debugger stub needs, but aren't yet implemented. */ - -int -AIOReadData (int portHandle, char *buffer, LONG length, LONG *numberBytesRead) -{ - return AIO_SUCCESS; -} - -int -AIOWriteData (int portHandle, char *buffer, LONG length, - LONG *numberBytesWritten) - -{ - return AIO_SUCCESS; -} - -int -AIOAcquirePort (int *hardwareType, int *boardNumber, int *portNumber, - int *portHandle) -{ - return AIO_SUCCESS; -} - -int -AIOConfigurePort (int portHandle, BYTE bitRate, BYTE dataBits, BYTE stopBits, - BYTE parityMode, BYTE flowCtrlMode) -{ - return AIO_SUCCESS; -} - -int -AIOGetPortConfiguration (int portHandle, AIOPORTCONFIG *pPortConfig, - AIODVRCONFIG *pDvrConfig) -{ - fprintf (stderr, "AIOGetPortConfiguration stubbed out\n"); - exit (1); -} - -int -AIOReleasePort (int portHandle) -{ - return AIO_SUCCESS; -} - -int -AIOSetExternalControl (int portHandle, int requestType, int requestValue) -{ - return AIO_SUCCESS; -} - -int -AIOGetExternalStatus (int portHandle, LONG *extStatus, LONG *chgdExtStatus) -{ - fprintf (stderr, "AIOGetExternalStatus stubbed out\n"); - exit (1); -} - -void -StopBell () -{ -} - -int -Breakpoint (int __arg) -{ - fprintf (stderr, "Breakpoint() stubbed out\n"); - exit (1); -} diff --git a/gdb/nlm/gdbserve.def b/gdb/nlm/gdbserve.def index e6d72d4..588028d 100644 --- a/gdb/nlm/gdbserve.def +++ b/gdb/nlm/gdbserve.def @@ -39,3 +39,4 @@ import strcpy strlen strnicmp + strtol -- 2.7.4