Skip to content

Commit

Permalink
minor tweaks
Browse files Browse the repository at this point in the history
Change-Id: I58e6759ec996ec6d49fc9f3dbc201c20db7384ec
  • Loading branch information
cooljeanius committed Nov 15, 2023
1 parent 11cf073 commit 6579038
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/apple-gdb-1824-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
- run: cd src && for dir in sim tcl expect dejagnu itcl libgui; do if test -e ${dir}/Makefile; then make check-${dir} V=0 RUNTESTFLAGS="-v"; elif test -d ${dir}; then ls ${dir}/Makefile*; else echo "skipping testing ${dir}"; fi; done
- run: cd src && make check-bfd
- run: cd src && make check-opcodes
- run: cd src && make check-dejagnu
# (dejagnu is now moved into the loop above)
- run: cd src && make check-intl
- run: cd src && make check-utils
- run: time (pwd && ls)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/apple-gdb-1824.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- run: cd src && make check-libiberty
- run: cd src && make -C tcl/unix tcltest
- run: cd src && for dir in sim itcl; do if test -e ${dir}/Makefile; then make check-${dir} V=0 RUNTESTFLAGS="-v"; elif test -d ${dir}; then ls ${dir}/Makefile*; else echo "skipping testing ${dir}"; fi; done
- run: pwd
- run: time (pwd && ls)
if: "${{ success() }}"
- run: find . -name config.log -print0 | xargs cat | grep -i error | sort | uniq
if: "${{ failure() }}"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ jobs:
cp -v ./*.o .. || ls ./*.o || pwd; \
popd; \
fi
find . -name conftest.o -exec rm -fv {} ';'
- name: Extra coverage build (Java)
if: matrix.language == 'java-kotlin' && success()
Expand Down
36 changes: 26 additions & 10 deletions src/gdb/attic/pyr-tdep_old.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,31 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */

#if !defined(__has_include)
# define __has_include(foo) 0
#endif /* !__has_include */

#if defined(HAVE_STDIO_H) || defined(__APPLE__) || __has_include(<stdio.h>)
# include <stdio.h>
#endif /* HAVE_STDIO_H || __APPLE__ */

#if defined(HAVE_STRING_H) || defined(__APPLE__) || __has_include(<string.h>)
# include <string.h>
#endif /* HAVE_STRING_H || __APPLE__ */

#if defined(HAVE_SYS_TYPES_H) || defined(__APPLE__) || __has_include(<sys/types.h>)
# include <sys/types.h>
#endif /* HAVE_SYS_TYPES_H || __APPLE__ */

#if defined(HAVE_SYS_PTRACE_H) || defined(__APPLE__) || __has_include(<sys/ptrace.h>)
# include <sys/ptrace.h>
#endif /* HAVE_SYS_PTRACE_H || __APPLE__ */

/*** Prettier register printing. ***/

/* Print registers in the same format as pyramid's dbx, adb, sdb. */
pyr_print_registers(reg_buf, regnum)
long *reg_buf[];
int
pyr_print_registers(long *reg_buf[], int regnum)
{
register int regno;
int usp, ksp;
Expand All @@ -49,10 +69,8 @@ pyr_print_registers(reg_buf, regnum)

/* Print the register regnum, or all registers if regnum is -1.
fpregs is currently ignored. */

pyr_do_registers_info (regnum, fpregs)
int regnum;
int fpregs;
int
pyr_do_registers_info(int regnum, int fpregs)
{
/* On a pyr, we know a virtual register can always fit in an long.
Here (and elsewhere) we take advantage of that. Yuk. */
Expand Down Expand Up @@ -82,8 +100,7 @@ pyr_do_registers_info (regnum, fpregs)

/*** Debugging editions of various macros from m-pyr.h ****/

CORE_ADDR frame_locals_address (frame)
FRAME frame;
CORE_ADDR frame_locals_address(FRAME frame)
{
register int addr = find_saved_register (frame,CFP_REGNUM);
register int result = read_memory_integer (addr, 4);
Expand All @@ -107,8 +124,7 @@ CORE_ADDR frame_locals_address (frame)
return ((frame->next) ? result: frame->frame_cfp);
}

CORE_ADDR frame_args_addr (frame)
FRAME frame;
CORE_ADDR frame_args_addr(FRAME frame)
{
register int addr = find_saved_register (frame,CFP_REGNUM);
register int result = read_memory_integer (addr, 4);
Expand Down
4 changes: 2 additions & 2 deletions src/gdb/m68k-stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ typedef void (*ExceptionHook)(int); /* pointer to function with int parm */
typedef void (*Function)(); /* pointer to a function */

extern void putDebugChar(); /* write a single character */
extern int getDebugChar(); /* read and return a single char */
extern int getDebugChar(void); /* read and return a single char */

extern Function exceptionHandler(); /* assign an exception handler */
extern ExceptionHook exceptionHook; /* hook variable for errors/exceptions */
Expand All @@ -128,7 +128,7 @@ extern ExceptionHook exceptionHook; /* hook variable for errors/exceptions */
/* FORWARD DECLARATIONS */
/************************/
static void
initializeRemcomErrorFrame ();
initializeRemcomErrorFrame(void);

/************************************************************************/
/* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/
Expand Down
4 changes: 2 additions & 2 deletions src/gdb/stubs/m68k-stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ typedef void (*ExceptionHook)(int); /* pointer to function with int parm */
typedef void (*Function)(); /* pointer to a function */

extern void putDebugChar(); /* write a single character */
extern int getDebugChar(); /* read and return a single char */
extern int getDebugChar(void); /* read and return a single char */

extern Function exceptionHandler(); /* assign an exception handler */
extern ExceptionHook exceptionHook; /* hook variable for errors/exceptions */
Expand All @@ -128,7 +128,7 @@ extern ExceptionHook exceptionHook; /* hook variable for errors/exceptions */
/* FORWARD DECLARATIONS */
/************************/
static void
initializeRemcomErrorFrame ();
initializeRemcomErrorFrame(void);

/************************************************************************/
/* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/
Expand Down

0 comments on commit 6579038

Please sign in to comment.