aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ.T. Conklin <jtc@acorntoolworks.com>1994-12-22 21:33:00 +0000
committerJ.T. Conklin <jtc@acorntoolworks.com>1994-12-22 21:33:00 +0000
commit67b1268238368041d1a8b91c718dcf84cd25db07 (patch)
tree0d929da856fb8cd935012c199531776d633c2759
parent9b826d6df6c9d126b9e52e2c4b3eabfc3589eb0d (diff)
downloadgdb-67b1268238368041d1a8b91c718dcf84cd25db07.zip
gdb-67b1268238368041d1a8b91c718dcf84cd25db07.tar.gz
gdb-67b1268238368041d1a8b91c718dcf84cd25db07.tar.bz2
* nlm/gdbserve.c, nlm/ppc.c, nlm/ppc.h: Don't try to use
ALTERNATE_MEM_FUNCS.
-rw-r--r--gdb/nlm/gdbserve.c7
-rw-r--r--gdb/nlm/ppc.c7
-rw-r--r--gdb/nlm/ppc.h2
3 files changed, 10 insertions, 6 deletions
diff --git a/gdb/nlm/gdbserve.c b/gdb/nlm/gdbserve.c
index 483885a..1ad1c08 100644
--- a/gdb/nlm/gdbserve.c
+++ b/gdb/nlm/gdbserve.c
@@ -69,8 +69,9 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <time.h>
+#include <ctype.h>
#include <errno.h>
+#include <time.h>
#ifdef __i386__
#include <dfs.h>
@@ -380,14 +381,14 @@ volatile int mem_err = 0;
to mem_fault, they won't get restored, so there better not be any
saved). */
-static int
+int
get_char (addr)
char *addr;
{
return *addr;
}
-static void
+void
set_char (addr, val)
char *addr;
int val;
diff --git a/gdb/nlm/ppc.c b/gdb/nlm/ppc.c
index 80185c1..e171efc 100644
--- a/gdb/nlm/ppc.c
+++ b/gdb/nlm/ppc.c
@@ -61,12 +61,12 @@ registers_to_frame (regs, frame)
hex2mem (&regs[MQ_REGNUM * 4 * 2], &frame->ExceptionState.u.SpecialRegistersEnumerated.CsavedMQ, 4 * 1, 0);
}
-extern int ReadByteAltDebugger (char* addr, char *theByte);
-
-extern int WriteByteAltDebugger (char* addr, char theByte);
extern volatile int mem_err;
+#ifdef ALTERNATE_MEM_FUNCS
+extern int ReadByteAltDebugger (char* addr, char *theByte);
+extern int WriteByteAltDebugger (char* addr, char theByte);
int
get_char (addr)
char *addr;
@@ -87,6 +87,7 @@ set_char (addr, val)
if (!WriteByteAltDebugger (addr, val))
mem_err = 1;
}
+#endif
int
mem_write (dst, src, len)
diff --git a/gdb/nlm/ppc.h b/gdb/nlm/ppc.h
index 849531b..84cee6b 100644
--- a/gdb/nlm/ppc.h
+++ b/gdb/nlm/ppc.h
@@ -157,7 +157,9 @@ struct StackFrame
extern unsigned char breakpoint_insn[];
#define BREAKPOINT_SIZE 4
+#if 0
#define ALTERNATE_MEM_FUNCS /* We need our own get_char/set_char */
+#endif
extern int get_char (char *addr);
extern void set_char (char *addr, int val);