URL
https://opencores.org/ocsvn/openrisc/openrisc/trunk
Subversion Repositories openrisc
Compare Revisions
- This comparison shows the changes necessary to convert path
/openrisc/trunk/or1ksim/debug
- from Rev 234 to Rev 235
- ↔ Reverse comparison
Rev 234 → Rev 235
/gdbcomm.c
File deleted
gdbcomm.c
Property changes :
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: gdbcomm.h
===================================================================
--- gdbcomm.h (revision 234)
+++ gdbcomm.h (nonexistent)
@@ -1,40 +0,0 @@
-/* gdbcomm.h -- Communication routines for gdb
-
- Copyright (C) 2001 by Marko Mlinar, markom@opencores.org
- Copyright (C) 2008 Embecosm Limited
-
- Contributor Jeremy Bennett
-
- This file is part of Or1ksim, the OpenRISC 1000 Architectural Simulator.
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the Free
- Software Foundation; either version 3 of the License, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details.
-
- You should have received a copy of the GNU General Public License along
- with this program. If not, see . */
-
-/* This program is commented throughout in a fashion suitable for processing
- with Doxygen. */
-
-
-#ifndef GDBCOMM__H
-#define GDBCOMM__H
-
-enum boolean {
- FALSE = 0,
- TRUE = 1
-};
-
-/* Prototypes for external use */
-extern void handle_server_socket (enum boolean);
-extern void block_jtag ();
-extern void gdbcomm_init ();
-
-#endif /* GDBCOMM__H */
gdbcomm.h
Property changes :
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Id
\ No newline at end of property
Index: Makefile.in
===================================================================
--- Makefile.in (revision 234)
+++ Makefile.in (revision 235)
@@ -72,8 +72,7 @@
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libdebug_la_LIBADD =
-am_libdebug_la_OBJECTS = debug-unit.lo gdbcomm.lo jtag.lo \
- rsp-server.lo
+am_libdebug_la_OBJECTS = debug-unit.lo jtag.lo rsp-server.lo
libdebug_la_OBJECTS = $(am_libdebug_la_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -155,6 +154,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
POW_LIB = @POW_LIB@
@@ -228,8 +228,6 @@
libdebug_la_SOURCES = debug-unit.c \
debug-unit.h \
gdb.h \
- gdbcomm.c \
- gdbcomm.h \
jtag.c \
jtag.h \
rsp-server.c \
@@ -288,7 +286,6 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug-unit.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdbcomm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jtag.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rsp-server.Plo@am__quote@
/debug-unit.c
981,34 → 981,9
|
|
/*---------------------------------------------------------------------------*/ |
/*!Enable or disable the legacy GDB interface to the debug unit |
|
This is for use with the OpenRISC Remote JTAG protocol (now deprecated). It |
may only be specified if the RSP interface is not specified. If both are |
specified, the RSP will be used. |
|
@param[in] val The value to use |
@param[in] dat The config data structure (not used here) */ |
/*---------------------------------------------------------------------------*/ |
static void |
debug_gdb_enabled (union param_val val, void *dat) |
{ |
config.debug.gdb_enabled = val.int_val; |
|
if (config.debug.gdb_enabled && config.debug.rsp_enabled) |
{ |
fprintf (stderr, "WARNING. Cannot specify both legacy and RSP GDB " |
"interfaces: legacy interface ignored\n"); |
config.debug.gdb_enabled = 0; |
} |
} /* debug_gdb_enabled () */ |
|
|
/*---------------------------------------------------------------------------*/ |
/*!Enable or disable Remote Serial Protocol GDB interface to the debug unit |
|
This is the preferred interface. It may only be specified if the RSP |
interface is not specified. If both are specified, the RSP will be used. |
This is the now the only interface. |
|
@param[in] val The value to use |
@param[in] dat The config data structure (not used here) */ |
1018,43 → 993,10
{ |
config.debug.rsp_enabled = val.int_val; |
|
if (config.debug.gdb_enabled && config.debug.rsp_enabled) |
{ |
fprintf (stderr, "WARNING. Cannot specify both legacy and RSP GDB " |
"interfaces: legacy interface ignored\n"); |
config.debug.gdb_enabled = 0; |
} |
} /* debug_rsp_enabled () */ |
|
|
/*---------------------------------------------------------------------------*/ |
/*!Set the legacy GDB server port |
|
This is for use with the OpenRISC Remote JTAG protocol (now deprecated). |
Ensure the value chosen is valid. Note that 0 is permitted, meaning the |
connection should be to the "or1ksim" service, rather than a port. |
|
Both this and the RSP port may be specified, but only one may be enabled |
(see debug_gdb_enabled() and debug_rsp_enabled()). |
|
@param[in] val The value to use |
@param[in] dat The config data structure (not used here) */ |
/*---------------------------------------------------------------------------*/ |
static void |
debug_server_port (union param_val val, void *dat) |
{ |
if ((val.int_val < 0) || (val.int_val > 65535)) |
{ |
fprintf (stderr, "Warning: invalid legacy GDB port specified: ignored\n"); |
} |
else |
{ |
config.debug.server_port = val.int_val; |
} |
} /* debug_server_port() */ |
|
|
/*---------------------------------------------------------------------------*/ |
/*!Set the Remote Serial Protocol GDB server port |
|
This is for use with the RSP, which is now the preferred interface. Ensure |
1061,9 → 1003,6
the value chosen is valid. Note that 0 is permitted, meaning the connection |
should be to the "or1ksim-rsp" service, rather than a port. |
|
Both this and the legacy port may be specified, but only one may be enabled |
(see debug_gdb_enabled() and debug_rsp_enabled()). |
|
@param[in] val The value to use |
@param[in] dat The config data structure (not used here) */ |
/*---------------------------------------------------------------------------*/ |
1104,9 → 1043,7
struct config_section *sec = reg_config_sec ("debug", NULL, NULL); |
|
reg_config_param (sec, "enabled", PARAMT_INT, debug_enabled); |
reg_config_param (sec, "gdb_enabled", PARAMT_INT, debug_gdb_enabled); |
reg_config_param (sec, "rsp_enabled", PARAMT_INT, debug_rsp_enabled); |
reg_config_param (sec, "server_port", PARAMT_INT, debug_server_port); |
reg_config_param (sec, "rsp_port", PARAMT_INT, debug_rsp_port); |
reg_config_param (sec, "vapi_id", PARAMT_INT, debug_vapi_id); |
|
/Makefile.am
26,8 → 26,6
libdebug_la_SOURCES = debug-unit.c \ |
debug-unit.h \ |
gdb.h \ |
gdbcomm.c \ |
gdbcomm.h \ |
jtag.c \ |
jtag.h \ |
rsp-server.c \ |