diff options
author | Simon Marchi <simon.marchi@efficios.com> | 2020-11-02 10:26:14 -0500 |
---|---|---|
committer | Simon Marchi <simon.marchi@efficios.com> | 2020-11-02 10:28:45 -0500 |
commit | dda83cd783075941aabe9b0292b004b11f00c831 (patch) | |
tree | 185c06ef106c06ecc55ea045a4916495c1a3526b /gdb/stubs/ia64vms-stub.c | |
parent | 1c2bec1918cee91221bccc30db4f0253dc31d1b7 (diff) | |
download | gdb-dda83cd783075941aabe9b0292b004b11f00c831.zip gdb-dda83cd783075941aabe9b0292b004b11f00c831.tar.gz gdb-dda83cd783075941aabe9b0292b004b11f00c831.tar.bz2 |
gdb, gdbserver, gdbsupport: fix leading space vs tabs issues
Many spots incorrectly use only spaces for indentation (for example,
there are a lot of spots in ada-lang.c). I've always found it awkward
when I needed to edit one of these spots: do I keep the original wrong
indentation, or do I fix it? What if the lines around it are also
wrong, do I fix them too? I probably don't want to fix them in the same
patch, to avoid adding noise to my patch.
So I propose to fix as much as possible once and for all (hopefully).
One typical counter argument for this is that it makes code archeology
more difficult, because git-blame will show this commit as the last
change for these lines. My counter counter argument is: when
git-blaming, you often need to do "blame the file at the parent commit"
anyway, to go past some other refactor that touched the line you are
interested in, but is not the change you are looking for. So you
already need a somewhat efficient way to do this.
Using some interactive tool, rather than plain git-blame, makes this
trivial. For example, I use "tig blame <file>", where going back past
the commit that changed the currently selected line is one keystroke.
It looks like Magit in Emacs does it too (though I've never used it).
Web viewers of Github and Gitlab do it too. My point is that it won't
really make archeology more difficult.
The other typical counter argument is that it will cause conflicts with
existing patches. That's true... but it's a one time cost, and those
are not conflicts that are difficult to resolve. I have also tried "git
rebase --ignore-whitespace", it seems to work well. Although that will
re-introduce the faulty indentation, so one needs to take care of fixing
the indentation in the patch after that (which is easy).
gdb/ChangeLog:
* aarch64-linux-tdep.c: Fix indentation.
* aarch64-ravenscar-thread.c: Fix indentation.
* aarch64-tdep.c: Fix indentation.
* aarch64-tdep.h: Fix indentation.
* ada-lang.c: Fix indentation.
* ada-lang.h: Fix indentation.
* ada-tasks.c: Fix indentation.
* ada-typeprint.c: Fix indentation.
* ada-valprint.c: Fix indentation.
* ada-varobj.c: Fix indentation.
* addrmap.c: Fix indentation.
* addrmap.h: Fix indentation.
* agent.c: Fix indentation.
* aix-thread.c: Fix indentation.
* alpha-bsd-nat.c: Fix indentation.
* alpha-linux-tdep.c: Fix indentation.
* alpha-mdebug-tdep.c: Fix indentation.
* alpha-nbsd-tdep.c: Fix indentation.
* alpha-obsd-tdep.c: Fix indentation.
* alpha-tdep.c: Fix indentation.
* amd64-bsd-nat.c: Fix indentation.
* amd64-darwin-tdep.c: Fix indentation.
* amd64-linux-nat.c: Fix indentation.
* amd64-linux-tdep.c: Fix indentation.
* amd64-nat.c: Fix indentation.
* amd64-obsd-tdep.c: Fix indentation.
* amd64-tdep.c: Fix indentation.
* amd64-windows-tdep.c: Fix indentation.
* annotate.c: Fix indentation.
* arc-tdep.c: Fix indentation.
* arch-utils.c: Fix indentation.
* arch/arm-get-next-pcs.c: Fix indentation.
* arch/arm.c: Fix indentation.
* arm-linux-nat.c: Fix indentation.
* arm-linux-tdep.c: Fix indentation.
* arm-nbsd-tdep.c: Fix indentation.
* arm-pikeos-tdep.c: Fix indentation.
* arm-tdep.c: Fix indentation.
* arm-tdep.h: Fix indentation.
* arm-wince-tdep.c: Fix indentation.
* auto-load.c: Fix indentation.
* auxv.c: Fix indentation.
* avr-tdep.c: Fix indentation.
* ax-gdb.c: Fix indentation.
* ax-general.c: Fix indentation.
* bfin-linux-tdep.c: Fix indentation.
* block.c: Fix indentation.
* block.h: Fix indentation.
* blockframe.c: Fix indentation.
* bpf-tdep.c: Fix indentation.
* break-catch-sig.c: Fix indentation.
* break-catch-syscall.c: Fix indentation.
* break-catch-throw.c: Fix indentation.
* breakpoint.c: Fix indentation.
* breakpoint.h: Fix indentation.
* bsd-uthread.c: Fix indentation.
* btrace.c: Fix indentation.
* build-id.c: Fix indentation.
* buildsym-legacy.h: Fix indentation.
* buildsym.c: Fix indentation.
* c-typeprint.c: Fix indentation.
* c-valprint.c: Fix indentation.
* c-varobj.c: Fix indentation.
* charset.c: Fix indentation.
* cli/cli-cmds.c: Fix indentation.
* cli/cli-decode.c: Fix indentation.
* cli/cli-decode.h: Fix indentation.
* cli/cli-script.c: Fix indentation.
* cli/cli-setshow.c: Fix indentation.
* coff-pe-read.c: Fix indentation.
* coffread.c: Fix indentation.
* compile/compile-cplus-types.c: Fix indentation.
* compile/compile-object-load.c: Fix indentation.
* compile/compile-object-run.c: Fix indentation.
* completer.c: Fix indentation.
* corefile.c: Fix indentation.
* corelow.c: Fix indentation.
* cp-abi.h: Fix indentation.
* cp-namespace.c: Fix indentation.
* cp-support.c: Fix indentation.
* cp-valprint.c: Fix indentation.
* cris-linux-tdep.c: Fix indentation.
* cris-tdep.c: Fix indentation.
* darwin-nat-info.c: Fix indentation.
* darwin-nat.c: Fix indentation.
* darwin-nat.h: Fix indentation.
* dbxread.c: Fix indentation.
* dcache.c: Fix indentation.
* disasm.c: Fix indentation.
* dtrace-probe.c: Fix indentation.
* dwarf2/abbrev.c: Fix indentation.
* dwarf2/attribute.c: Fix indentation.
* dwarf2/expr.c: Fix indentation.
* dwarf2/frame.c: Fix indentation.
* dwarf2/index-cache.c: Fix indentation.
* dwarf2/index-write.c: Fix indentation.
* dwarf2/line-header.c: Fix indentation.
* dwarf2/loc.c: Fix indentation.
* dwarf2/macro.c: Fix indentation.
* dwarf2/read.c: Fix indentation.
* dwarf2/read.h: Fix indentation.
* elfread.c: Fix indentation.
* eval.c: Fix indentation.
* event-top.c: Fix indentation.
* exec.c: Fix indentation.
* exec.h: Fix indentation.
* expprint.c: Fix indentation.
* f-lang.c: Fix indentation.
* f-typeprint.c: Fix indentation.
* f-valprint.c: Fix indentation.
* fbsd-nat.c: Fix indentation.
* fbsd-tdep.c: Fix indentation.
* findvar.c: Fix indentation.
* fork-child.c: Fix indentation.
* frame-unwind.c: Fix indentation.
* frame-unwind.h: Fix indentation.
* frame.c: Fix indentation.
* frv-linux-tdep.c: Fix indentation.
* frv-tdep.c: Fix indentation.
* frv-tdep.h: Fix indentation.
* ft32-tdep.c: Fix indentation.
* gcore.c: Fix indentation.
* gdb_bfd.c: Fix indentation.
* gdbarch.sh: Fix indentation.
* gdbarch.c: Re-generate
* gdbarch.h: Re-generate.
* gdbcore.h: Fix indentation.
* gdbthread.h: Fix indentation.
* gdbtypes.c: Fix indentation.
* gdbtypes.h: Fix indentation.
* glibc-tdep.c: Fix indentation.
* gnu-nat.c: Fix indentation.
* gnu-nat.h: Fix indentation.
* gnu-v2-abi.c: Fix indentation.
* gnu-v3-abi.c: Fix indentation.
* go32-nat.c: Fix indentation.
* guile/guile-internal.h: Fix indentation.
* guile/scm-cmd.c: Fix indentation.
* guile/scm-frame.c: Fix indentation.
* guile/scm-iterator.c: Fix indentation.
* guile/scm-math.c: Fix indentation.
* guile/scm-ports.c: Fix indentation.
* guile/scm-pretty-print.c: Fix indentation.
* guile/scm-value.c: Fix indentation.
* h8300-tdep.c: Fix indentation.
* hppa-linux-nat.c: Fix indentation.
* hppa-linux-tdep.c: Fix indentation.
* hppa-nbsd-nat.c: Fix indentation.
* hppa-nbsd-tdep.c: Fix indentation.
* hppa-obsd-nat.c: Fix indentation.
* hppa-tdep.c: Fix indentation.
* hppa-tdep.h: Fix indentation.
* i386-bsd-nat.c: Fix indentation.
* i386-darwin-nat.c: Fix indentation.
* i386-darwin-tdep.c: Fix indentation.
* i386-dicos-tdep.c: Fix indentation.
* i386-gnu-nat.c: Fix indentation.
* i386-linux-nat.c: Fix indentation.
* i386-linux-tdep.c: Fix indentation.
* i386-nto-tdep.c: Fix indentation.
* i386-obsd-tdep.c: Fix indentation.
* i386-sol2-nat.c: Fix indentation.
* i386-tdep.c: Fix indentation.
* i386-tdep.h: Fix indentation.
* i386-windows-tdep.c: Fix indentation.
* i387-tdep.c: Fix indentation.
* i387-tdep.h: Fix indentation.
* ia64-libunwind-tdep.c: Fix indentation.
* ia64-libunwind-tdep.h: Fix indentation.
* ia64-linux-nat.c: Fix indentation.
* ia64-linux-tdep.c: Fix indentation.
* ia64-tdep.c: Fix indentation.
* ia64-tdep.h: Fix indentation.
* ia64-vms-tdep.c: Fix indentation.
* infcall.c: Fix indentation.
* infcmd.c: Fix indentation.
* inferior.c: Fix indentation.
* infrun.c: Fix indentation.
* iq2000-tdep.c: Fix indentation.
* language.c: Fix indentation.
* linespec.c: Fix indentation.
* linux-fork.c: Fix indentation.
* linux-nat.c: Fix indentation.
* linux-tdep.c: Fix indentation.
* linux-thread-db.c: Fix indentation.
* lm32-tdep.c: Fix indentation.
* m2-lang.c: Fix indentation.
* m2-typeprint.c: Fix indentation.
* m2-valprint.c: Fix indentation.
* m32c-tdep.c: Fix indentation.
* m32r-linux-tdep.c: Fix indentation.
* m32r-tdep.c: Fix indentation.
* m68hc11-tdep.c: Fix indentation.
* m68k-bsd-nat.c: Fix indentation.
* m68k-linux-nat.c: Fix indentation.
* m68k-linux-tdep.c: Fix indentation.
* m68k-tdep.c: Fix indentation.
* machoread.c: Fix indentation.
* macrocmd.c: Fix indentation.
* macroexp.c: Fix indentation.
* macroscope.c: Fix indentation.
* macrotab.c: Fix indentation.
* macrotab.h: Fix indentation.
* main.c: Fix indentation.
* mdebugread.c: Fix indentation.
* mep-tdep.c: Fix indentation.
* mi/mi-cmd-catch.c: Fix indentation.
* mi/mi-cmd-disas.c: Fix indentation.
* mi/mi-cmd-env.c: Fix indentation.
* mi/mi-cmd-stack.c: Fix indentation.
* mi/mi-cmd-var.c: Fix indentation.
* mi/mi-cmds.c: Fix indentation.
* mi/mi-main.c: Fix indentation.
* mi/mi-parse.c: Fix indentation.
* microblaze-tdep.c: Fix indentation.
* minidebug.c: Fix indentation.
* minsyms.c: Fix indentation.
* mips-linux-nat.c: Fix indentation.
* mips-linux-tdep.c: Fix indentation.
* mips-nbsd-tdep.c: Fix indentation.
* mips-tdep.c: Fix indentation.
* mn10300-linux-tdep.c: Fix indentation.
* mn10300-tdep.c: Fix indentation.
* moxie-tdep.c: Fix indentation.
* msp430-tdep.c: Fix indentation.
* namespace.h: Fix indentation.
* nat/fork-inferior.c: Fix indentation.
* nat/gdb_ptrace.h: Fix indentation.
* nat/linux-namespaces.c: Fix indentation.
* nat/linux-osdata.c: Fix indentation.
* nat/netbsd-nat.c: Fix indentation.
* nat/x86-dregs.c: Fix indentation.
* nbsd-nat.c: Fix indentation.
* nbsd-tdep.c: Fix indentation.
* nios2-linux-tdep.c: Fix indentation.
* nios2-tdep.c: Fix indentation.
* nto-procfs.c: Fix indentation.
* nto-tdep.c: Fix indentation.
* objfiles.c: Fix indentation.
* objfiles.h: Fix indentation.
* opencl-lang.c: Fix indentation.
* or1k-tdep.c: Fix indentation.
* osabi.c: Fix indentation.
* osabi.h: Fix indentation.
* osdata.c: Fix indentation.
* p-lang.c: Fix indentation.
* p-typeprint.c: Fix indentation.
* p-valprint.c: Fix indentation.
* parse.c: Fix indentation.
* ppc-linux-nat.c: Fix indentation.
* ppc-linux-tdep.c: Fix indentation.
* ppc-nbsd-nat.c: Fix indentation.
* ppc-nbsd-tdep.c: Fix indentation.
* ppc-obsd-nat.c: Fix indentation.
* ppc-ravenscar-thread.c: Fix indentation.
* ppc-sysv-tdep.c: Fix indentation.
* ppc64-tdep.c: Fix indentation.
* printcmd.c: Fix indentation.
* proc-api.c: Fix indentation.
* producer.c: Fix indentation.
* producer.h: Fix indentation.
* prologue-value.c: Fix indentation.
* prologue-value.h: Fix indentation.
* psymtab.c: Fix indentation.
* python/py-arch.c: Fix indentation.
* python/py-bpevent.c: Fix indentation.
* python/py-event.c: Fix indentation.
* python/py-event.h: Fix indentation.
* python/py-finishbreakpoint.c: Fix indentation.
* python/py-frame.c: Fix indentation.
* python/py-framefilter.c: Fix indentation.
* python/py-inferior.c: Fix indentation.
* python/py-infthread.c: Fix indentation.
* python/py-objfile.c: Fix indentation.
* python/py-prettyprint.c: Fix indentation.
* python/py-registers.c: Fix indentation.
* python/py-signalevent.c: Fix indentation.
* python/py-stopevent.c: Fix indentation.
* python/py-stopevent.h: Fix indentation.
* python/py-threadevent.c: Fix indentation.
* python/py-tui.c: Fix indentation.
* python/py-unwind.c: Fix indentation.
* python/py-value.c: Fix indentation.
* python/py-xmethods.c: Fix indentation.
* python/python-internal.h: Fix indentation.
* python/python.c: Fix indentation.
* ravenscar-thread.c: Fix indentation.
* record-btrace.c: Fix indentation.
* record-full.c: Fix indentation.
* record.c: Fix indentation.
* reggroups.c: Fix indentation.
* regset.h: Fix indentation.
* remote-fileio.c: Fix indentation.
* remote.c: Fix indentation.
* reverse.c: Fix indentation.
* riscv-linux-tdep.c: Fix indentation.
* riscv-ravenscar-thread.c: Fix indentation.
* riscv-tdep.c: Fix indentation.
* rl78-tdep.c: Fix indentation.
* rs6000-aix-tdep.c: Fix indentation.
* rs6000-lynx178-tdep.c: Fix indentation.
* rs6000-nat.c: Fix indentation.
* rs6000-tdep.c: Fix indentation.
* rust-lang.c: Fix indentation.
* rx-tdep.c: Fix indentation.
* s12z-tdep.c: Fix indentation.
* s390-linux-tdep.c: Fix indentation.
* score-tdep.c: Fix indentation.
* ser-base.c: Fix indentation.
* ser-mingw.c: Fix indentation.
* ser-uds.c: Fix indentation.
* ser-unix.c: Fix indentation.
* serial.c: Fix indentation.
* sh-linux-tdep.c: Fix indentation.
* sh-nbsd-tdep.c: Fix indentation.
* sh-tdep.c: Fix indentation.
* skip.c: Fix indentation.
* sol-thread.c: Fix indentation.
* solib-aix.c: Fix indentation.
* solib-darwin.c: Fix indentation.
* solib-frv.c: Fix indentation.
* solib-svr4.c: Fix indentation.
* solib.c: Fix indentation.
* source.c: Fix indentation.
* sparc-linux-tdep.c: Fix indentation.
* sparc-nbsd-tdep.c: Fix indentation.
* sparc-obsd-tdep.c: Fix indentation.
* sparc-ravenscar-thread.c: Fix indentation.
* sparc-tdep.c: Fix indentation.
* sparc64-linux-tdep.c: Fix indentation.
* sparc64-nbsd-tdep.c: Fix indentation.
* sparc64-obsd-tdep.c: Fix indentation.
* sparc64-tdep.c: Fix indentation.
* stabsread.c: Fix indentation.
* stack.c: Fix indentation.
* stap-probe.c: Fix indentation.
* stubs/ia64vms-stub.c: Fix indentation.
* stubs/m32r-stub.c: Fix indentation.
* stubs/m68k-stub.c: Fix indentation.
* stubs/sh-stub.c: Fix indentation.
* stubs/sparc-stub.c: Fix indentation.
* symfile-mem.c: Fix indentation.
* symfile.c: Fix indentation.
* symfile.h: Fix indentation.
* symmisc.c: Fix indentation.
* symtab.c: Fix indentation.
* symtab.h: Fix indentation.
* target-float.c: Fix indentation.
* target.c: Fix indentation.
* target.h: Fix indentation.
* tic6x-tdep.c: Fix indentation.
* tilegx-linux-tdep.c: Fix indentation.
* tilegx-tdep.c: Fix indentation.
* top.c: Fix indentation.
* tracefile-tfile.c: Fix indentation.
* tracepoint.c: Fix indentation.
* tui/tui-disasm.c: Fix indentation.
* tui/tui-io.c: Fix indentation.
* tui/tui-regs.c: Fix indentation.
* tui/tui-stack.c: Fix indentation.
* tui/tui-win.c: Fix indentation.
* tui/tui-winsource.c: Fix indentation.
* tui/tui.c: Fix indentation.
* typeprint.c: Fix indentation.
* ui-out.h: Fix indentation.
* unittests/copy_bitwise-selftests.c: Fix indentation.
* unittests/memory-map-selftests.c: Fix indentation.
* utils.c: Fix indentation.
* v850-tdep.c: Fix indentation.
* valarith.c: Fix indentation.
* valops.c: Fix indentation.
* valprint.c: Fix indentation.
* valprint.h: Fix indentation.
* value.c: Fix indentation.
* value.h: Fix indentation.
* varobj.c: Fix indentation.
* vax-tdep.c: Fix indentation.
* windows-nat.c: Fix indentation.
* windows-tdep.c: Fix indentation.
* xcoffread.c: Fix indentation.
* xml-syscall.c: Fix indentation.
* xml-tdesc.c: Fix indentation.
* xstormy16-tdep.c: Fix indentation.
* xtensa-config.c: Fix indentation.
* xtensa-linux-nat.c: Fix indentation.
* xtensa-linux-tdep.c: Fix indentation.
* xtensa-tdep.c: Fix indentation.
gdbserver/ChangeLog:
* ax.cc: Fix indentation.
* dll.cc: Fix indentation.
* inferiors.h: Fix indentation.
* linux-low.cc: Fix indentation.
* linux-nios2-low.cc: Fix indentation.
* linux-ppc-ipa.cc: Fix indentation.
* linux-ppc-low.cc: Fix indentation.
* linux-x86-low.cc: Fix indentation.
* linux-xtensa-low.cc: Fix indentation.
* regcache.cc: Fix indentation.
* server.cc: Fix indentation.
* tracepoint.cc: Fix indentation.
gdbsupport/ChangeLog:
* common-exceptions.h: Fix indentation.
* event-loop.cc: Fix indentation.
* fileio.cc: Fix indentation.
* filestuff.cc: Fix indentation.
* gdb-dlfcn.cc: Fix indentation.
* gdb_string_view.h: Fix indentation.
* job-control.cc: Fix indentation.
* signals.cc: Fix indentation.
Change-Id: I4bad7ae6be0fbe14168b8ebafb98ffe14964a695
Diffstat (limited to 'gdb/stubs/ia64vms-stub.c')
-rw-r--r-- | gdb/stubs/ia64vms-stub.c | 620 |
1 files changed, 310 insertions, 310 deletions
diff --git a/gdb/stubs/ia64vms-stub.c b/gdb/stubs/ia64vms-stub.c index 740a61b..0605928 100644 --- a/gdb/stubs/ia64vms-stub.c +++ b/gdb/stubs/ia64vms-stub.c @@ -75,7 +75,7 @@ extern void ots$fill (void *addr, size_t len, unsigned char b); extern void ots$move (void *dst, size_t len, const void *src); extern int ots$strcmp_eql (const void *str1, size_t str1len, - const void *str2, size_t str2len); + const void *str2, size_t str2len); /* Stub port number. */ static unsigned int serv_port = 1234; @@ -296,14 +296,14 @@ term_raw_write (const char *str, unsigned int len) struct _iosb iosb; status = sys$qiow (EFN$C_ENF, /* Event flag. */ - term_chan, /* I/O channel. */ - IO$_WRITEVBLK, /* I/O function code. */ - &iosb, /* I/O status block. */ - 0, /* Ast service routine. */ - 0, /* Ast parameter. */ - (char *)str, /* P1 - buffer address. */ - len, /* P2 - buffer length. */ - 0, 0, 0, 0); + term_chan, /* I/O channel. */ + IO$_WRITEVBLK, /* I/O function code. */ + &iosb, /* I/O status block. */ + 0, /* Ast service routine. */ + 0, /* Ast parameter. */ + (char *)str, /* P1 - buffer address. */ + len, /* P2 - buffer length. */ + 0, 0, 0, 0); if (status & STS$M_SUCCESS) status = iosb.iosb$w_status; @@ -443,10 +443,10 @@ term_init (void) /* Translate the logical name. */ status = SYS$TRNLNM (0, /* Attr of the logical name. */ - (void *) &tabdesc, /* Logical name table. */ - (void *) &logdesc, /* Logical name. */ - 0, /* Access mode. */ - item_lst); /* Item list. */ + (void *) &tabdesc, /* Logical name table. */ + (void *) &logdesc, /* Logical name. */ + 0, /* Access mode. */ + item_lst); /* Item list. */ if (!(status & STS$M_SUCCESS)) LIB$SIGNAL (status); @@ -461,9 +461,9 @@ term_init (void) /* Assign a channel. */ status = sys$assign (&term_desc, /* Device name. */ - &term_chan, /* I/O channel. */ - 0, /* Access mode. */ - 0); + &term_chan, /* I/O channel. */ + 0, /* Access mode. */ + 0); if (!(status & STS$M_SUCCESS)) LIB$SIGNAL (status); } @@ -522,13 +522,13 @@ sock_init (void) /* Create a listen socket. */ status = sys$qiow (EFN$C_ENF, /* Event flag. */ - listen_channel, /* I/O channel. */ - IO$_SETMODE, /* I/O function code. */ - &iosb, /* I/O status block. */ - 0, /* Ast service routine. */ - 0, /* Ast parameter. */ - &listen_sockchar, /* P1 - socket characteristics. */ - 0, 0, 0, 0, 0); + listen_channel, /* I/O channel. */ + IO$_SETMODE, /* I/O function code. */ + &iosb, /* I/O status block. */ + 0, /* Ast service routine. */ + 0, /* Ast parameter. */ + &listen_sockchar, /* P1 - socket characteristics. */ + 0, 0, 0, 0, 0); if (status & STS$M_SUCCESS) status = iosb.iosb$w_status; if (!(status & STS$M_SUCCESS)) @@ -549,17 +549,17 @@ sock_init (void) sockopt_itemlst.ile2$ps_bufaddr = &reuseaddr_itemlst; status = sys$qiow (EFN$C_ENF, /* Event flag. */ - listen_channel, /* I/O channel. */ - IO$_SETMODE, /* I/O function code. */ - &iosb, /* I/O status block. */ - 0, /* Ast service routine. */ - 0, /* Ast parameter. */ - 0, /* P1. */ - 0, /* P2. */ - 0, /* P3. */ - 0, /* P4. */ - (__int64) &sockopt_itemlst, /* P5 - socket options. */ - 0); + listen_channel, /* I/O channel. */ + IO$_SETMODE, /* I/O function code. */ + &iosb, /* I/O status block. */ + 0, /* Ast service routine. */ + 0, /* Ast parameter. */ + 0, /* P1. */ + 0, /* P2. */ + 0, /* P3. */ + 0, /* P4. */ + (__int64) &sockopt_itemlst, /* P5 - socket options. */ + 0); if (status & STS$M_SUCCESS) status = iosb.iosb$w_status; if (!(status & STS$M_SUCCESS)) @@ -581,15 +581,15 @@ sock_init (void) serv_itemlst.ile2$ps_bufaddr = &serv_addr; status = sys$qiow (EFN$C_ENF, /* Event flag. */ - listen_channel, /* I/O channel. */ - IO$_SETMODE, /* I/O function code. */ - &iosb, /* I/O status block. */ - 0, /* Ast service routine. */ - 0, /* Ast parameter. */ - 0, /* P1. */ - 0, /* P2. */ - (__int64) &serv_itemlst, /* P3 - local socket name. */ - 0, 0, 0); + listen_channel, /* I/O channel. */ + IO$_SETMODE, /* I/O function code. */ + &iosb, /* I/O status block. */ + 0, /* Ast service routine. */ + 0, /* Ast parameter. */ + 0, /* P1. */ + 0, /* P2. */ + (__int64) &serv_itemlst, /* P3 - local socket name. */ + 0, 0, 0); if (status & STS$M_SUCCESS) status = iosb.iosb$w_status; if (!(status & STS$M_SUCCESS)) @@ -600,16 +600,16 @@ sock_init (void) /* Set socket as a listen socket. */ status = sys$qiow (EFN$C_ENF, /* Event flag. */ - listen_channel, /* I/O channel. */ - IO$_SETMODE, /* I/O function code. */ - &iosb, /* I/O status block. */ - 0, /* Ast service routine. */ - 0, /* Ast parameter. */ - 0, /* P1. */ - 0, /* P2. */ - 0, /* P3. */ - 1, /* P4 - connection backlog. */ - 0, 0); + listen_channel, /* I/O channel. */ + IO$_SETMODE, /* I/O function code. */ + &iosb, /* I/O status block. */ + 0, /* Ast service routine. */ + 0, /* Ast parameter. */ + 0, /* P1. */ + 0, /* P2. */ + 0, /* P3. */ + 1, /* P4 - connection backlog. */ + 0, 0); if (status & STS$M_SUCCESS) status = iosb.iosb$w_status; if (!(status & STS$M_SUCCESS)) @@ -623,16 +623,16 @@ sock_init (void) wordswap (serv_addr.sin_port)); status = sys$qiow (EFN$C_ENF, /* Event flag. */ - listen_channel, /* I/O channel. */ - IO$_ACCESS|IO$M_ACCEPT, /* I/O function code. */ - &iosb, /* I/O status block. */ - 0, /* Ast service routine. */ - 0, /* Ast parameter. */ - 0, /* P1. */ - 0, /* P2. */ - 0, /* P3. */ - (__int64) &conn_channel, /* P4 - I/O channel for conn. */ - 0, 0); + listen_channel, /* I/O channel. */ + IO$_ACCESS|IO$M_ACCEPT, /* I/O function code. */ + &iosb, /* I/O status block. */ + 0, /* Ast service routine. */ + 0, /* Ast parameter. */ + 0, /* P1. */ + 0, /* P2. */ + 0, /* P3. */ + (__int64) &conn_channel, /* P4 - I/O channel for conn. */ + 0, 0); if (status & STS$M_SUCCESS) status = iosb.iosb$w_status; @@ -649,16 +649,16 @@ sock_init (void) cli_itemlst.ile3$ps_retlen_addr = &cli_addrlen; ots$fill (&cli_addr, sizeof(cli_addr), 0); status = sys$qiow (EFN$C_ENF, /* Event flag. */ - conn_channel, /* I/O channel. */ - IO$_SENSEMODE, /* I/O function code. */ - &iosb, /* I/O status block. */ - 0, /* Ast service routine. */ - 0, /* Ast parameter. */ - 0, /* P1. */ - 0, /* P2. */ - 0, /* P3. */ - (__int64) &cli_itemlst, /* P4 - peer socket name. */ - 0, 0); + conn_channel, /* I/O channel. */ + IO$_SENSEMODE, /* I/O function code. */ + &iosb, /* I/O status block. */ + 0, /* Ast service routine. */ + 0, /* Ast parameter. */ + 0, /* P1. */ + 0, /* P2. */ + 0, /* P3. */ + (__int64) &cli_itemlst, /* P4 - peer socket name. */ + 0, 0); if (status & STS$M_SUCCESS) status = iosb.iosb$w_status; if (!(status & STS$M_SUCCESS)) @@ -685,12 +685,12 @@ sock_close (void) /* Close socket. */ status = sys$qiow (EFN$C_ENF, /* Event flag. */ - conn_channel, /* I/O channel. */ - IO$_DEACCESS, /* I/O function code. */ - &iosb, /* I/O status block. */ - 0, /* Ast service routine. */ - 0, /* Ast parameter. */ - 0, 0, 0, 0, 0, 0); + conn_channel, /* I/O channel. */ + IO$_DEACCESS, /* I/O function code. */ + &iosb, /* I/O status block. */ + 0, /* Ast service routine. */ + 0, /* Ast parameter. */ + 0, 0, 0, 0, 0, 0); if (status & STS$M_SUCCESS) status = iosb.iosb$w_status; @@ -714,14 +714,14 @@ sock_close (void) static unsigned int page_set_rw (unsigned __int64 startva, unsigned __int64 len, - unsigned int *oldprot) + unsigned int *oldprot) { unsigned int status; unsigned __int64 retva; unsigned __int64 retlen; status = SYS$SETPRT_64 ((void *)startva, len, PSL$C_USER, PRT$C_UW, - (void *)&retva, &retlen, oldprot); + (void *)&retva, &retlen, oldprot); return status; } @@ -729,7 +729,7 @@ page_set_rw (unsigned __int64 startva, unsigned __int64 len, static void page_restore_rw (unsigned __int64 startva, unsigned __int64 len, - unsigned int prot) + unsigned int prot) { unsigned int status; unsigned __int64 retva; @@ -737,7 +737,7 @@ page_restore_rw (unsigned __int64 startva, unsigned __int64 len, unsigned int oldprot; status = SYS$SETPRT_64 ((void *)startva, len, PSL$C_USER, prot, - (void *)&retva, &retlen, &oldprot); + (void *)&retva, &retlen, &oldprot); if (!(status & STS$M_SUCCESS)) LIB$SIGNAL (status); } @@ -1267,7 +1267,7 @@ pkt2val (const unsigned char *pkt, unsigned int *pos) int r = hex2nibble (pkt[*pos]); if (r < 0) - return res; + return res; res = (res << 4) | r; (*pos)++; } @@ -1287,12 +1287,12 @@ mem2bin (const unsigned char *b, unsigned int len) case '}': case '*': case 0: - gdb_buf[gdb_blen++] = '}'; - gdb_buf[gdb_blen++] = b[i] ^ 0x20; - break; + gdb_buf[gdb_blen++] = '}'; + gdb_buf[gdb_blen++] = b[i] ^ 0x20; + break; default: - gdb_buf[gdb_blen++] = b[i]; - break; + gdb_buf[gdb_blen++] = b[i]; + break; } } @@ -1366,19 +1366,19 @@ handle_q_packet (const unsigned char *pkt, unsigned int pktlen) pc = pkt2val (pkt, &pos); if (pkt[pos] != ':') - return; + return; pos++; off = pkt2val (pkt, &pos); if (pkt[pos] != ',' || off != 0) - return; + return; pos++; len = pkt2val (pkt, &pos); if (pkt[pos] != '#' || len != 0x20) - return; + return; res = SYS$GET_UNWIND_ENTRY_INFO (pc, &uei.data, 0); if (res == SS$_NODATA || res != SS$_NORMAL) - ots$fill (uei.bytes, sizeof (uei.bytes), 0); + ots$fill (uei.bytes, sizeof (uei.bytes), 0); if (trace_unwind) { @@ -1450,7 +1450,7 @@ handle_q_packet (const unsigned char *pkt, unsigned int pktlen) thr = (pthread_t) pkt2val (pkt, &pos); if (pkt[pos] != '#') - return; + return; res = pthread_debug_thd_get_info_addr (thr, &info); if (res != 0) { @@ -1592,33 +1592,33 @@ handle_packet (unsigned char *pkt, unsigned int len) { case '?': if (len == 1) - { + { packet_status (); - return 0; - } + return 0; + } break; case 'c': if (len == 1) - { - /* Clear psr.ss. */ - excp_regs.psr.v &= ~(unsigned __int64)PSR$M_SS; - return 1; - } + { + /* Clear psr.ss. */ + excp_regs.psr.v &= ~(unsigned __int64)PSR$M_SS; + return 1; + } else - packet_error (0); + packet_error (0); break; case 'g': if (len == 1) - { - unsigned int i; + { + unsigned int i; struct ia64_all_regs *regs = get_selected_regs (); - unsigned char *p = regs->gr[0].b; + unsigned char *p = regs->gr[0].b; - for (i = 0; i < 8 * 32; i++) - byte2hex (gdb_buf + 1 + 2 * i, p[i]); - gdb_blen += 2 * 8 * 32; - return 0; - } + for (i = 0; i < 8 * 32; i++) + byte2hex (gdb_buf + 1 + 2 * i, p[i]); + gdb_blen += 2 * 8 * 32; + return 0; + } break; case 'H': if (pkt[1] == 'g') @@ -1678,24 +1678,24 @@ handle_packet (unsigned char *pkt, unsigned int len) break; case 'm': { - unsigned __int64 addr; + unsigned __int64 addr; unsigned __int64 paddr; - unsigned int l; - unsigned int i; - - addr = pkt2val (pkt, &pos); - if (pkt[pos] != ',') - { - packet_error (0); - return 0; - } - pos++; - l = pkt2val (pkt, &pos); - if (pkt[pos] != '#') - { - packet_error (0); - return 0; - } + unsigned int l; + unsigned int i; + + addr = pkt2val (pkt, &pos); + if (pkt[pos] != ',') + { + packet_error (0); + return 0; + } + pos++; + l = pkt2val (pkt, &pos); + if (pkt[pos] != '#') + { + packet_error (0); + return 0; + } /* Check access. */ i = l + (addr & VMS_PAGE_MASK); @@ -1721,27 +1721,27 @@ handle_packet (unsigned char *pkt, unsigned int len) break; case 'M': { - unsigned __int64 addr; - unsigned __int64 paddr; - unsigned int l; - unsigned int i; - unsigned int oldprot; - - addr = pkt2val (pkt, &pos); - if (pkt[pos] != ',') - { - packet_error (0); - return 0; - } - pos++; - l = pkt2val (pkt, &pos); - if (pkt[pos] != ':') - { - packet_error (0); - return 0; - } - pos++; - page_set_rw (addr, l, &oldprot); + unsigned __int64 addr; + unsigned __int64 paddr; + unsigned int l; + unsigned int i; + unsigned int oldprot; + + addr = pkt2val (pkt, &pos); + if (pkt[pos] != ',') + { + packet_error (0); + return 0; + } + pos++; + l = pkt2val (pkt, &pos); + if (pkt[pos] != ':') + { + packet_error (0); + return 0; + } + pos++; + page_set_rw (addr, l, &oldprot); /* Check access. */ i = l + (addr & VMS_PAGE_MASK); @@ -1760,63 +1760,63 @@ handle_packet (unsigned char *pkt, unsigned int len) } /* Write. */ - for (i = 0; i < l; i++) - { - int v = hex2byte (pkt + pos); - pos += 2; - ((unsigned char *)addr)[i] = v; - } + for (i = 0; i < l; i++) + { + int v = hex2byte (pkt + pos); + pos += 2; + ((unsigned char *)addr)[i] = v; + } /* Sync caches. */ - for (i = 0; i < l; i += 15) - __fc (addr + i); - __fc (addr + l); + for (i = 0; i < l; i += 15) + __fc (addr + i); + __fc (addr + l); - page_restore_rw (addr, l, oldprot); - packet_ok (); + page_restore_rw (addr, l, oldprot); + packet_ok (); } break; case 'p': { - unsigned int num = 0; - unsigned int i; + unsigned int num = 0; + unsigned int i; struct ia64_all_regs *regs = get_selected_regs (); - num = pkt2val (pkt, &pos); - if (pos != len) - { - packet_error (0); - return 0; - } - - switch (num) - { - case IA64_IP_REGNUM: - ireg2pkt (regs->ip.b); - break; - case IA64_BR0_REGNUM: - ireg2pkt (regs->br[0].b); - break; - case IA64_PSR_REGNUM: - ireg2pkt (regs->psr.b); - break; - case IA64_BSP_REGNUM: - ireg2pkt (regs->bsp.b); - break; - case IA64_CFM_REGNUM: - ireg2pkt (regs->cfm.b); - break; - case IA64_PFS_REGNUM: - ireg2pkt (regs->pfs.b); - break; - case IA64_PR_REGNUM: - ireg2pkt (regs->pr.b); - break; - default: - TERM_FAO ("gdbserv: unhandled reg !UW!/", num); - packet_error (0); - return 0; - } + num = pkt2val (pkt, &pos); + if (pos != len) + { + packet_error (0); + return 0; + } + + switch (num) + { + case IA64_IP_REGNUM: + ireg2pkt (regs->ip.b); + break; + case IA64_BR0_REGNUM: + ireg2pkt (regs->br[0].b); + break; + case IA64_PSR_REGNUM: + ireg2pkt (regs->psr.b); + break; + case IA64_BSP_REGNUM: + ireg2pkt (regs->bsp.b); + break; + case IA64_CFM_REGNUM: + ireg2pkt (regs->cfm.b); + break; + case IA64_PFS_REGNUM: + ireg2pkt (regs->pfs.b); + break; + case IA64_PR_REGNUM: + ireg2pkt (regs->pr.b); + break; + default: + TERM_FAO ("gdbserv: unhandled reg !UW!/", num); + packet_error (0); + return 0; + } } break; case 'q': @@ -1824,13 +1824,13 @@ handle_packet (unsigned char *pkt, unsigned int len) break; case 's': if (len == 1) - { - /* Set psr.ss. */ - excp_regs.psr.v |= (unsigned __int64)PSR$M_SS; - return 1; - } + { + /* Set psr.ss. */ + excp_regs.psr.v |= (unsigned __int64)PSR$M_SS; + return 1; + } else - packet_error (0); + packet_error (0); break; case 'T': /* Thread status. */ @@ -1907,14 +1907,14 @@ sock_write (const unsigned char *buf, int len) /* Write data to connection. */ status = sys$qiow (EFN$C_ENF, /* Event flag. */ - conn_channel, /* I/O channel. */ - IO$_WRITEVBLK, /* I/O function code. */ - &iosb, /* I/O status block. */ - 0, /* Ast service routine. */ - 0, /* Ast parameter. */ - (char *)buf, /* P1 - buffer address. */ - len, /* P2 - buffer length. */ - 0, 0, 0, 0); + conn_channel, /* I/O channel. */ + IO$_WRITEVBLK, /* I/O function code. */ + &iosb, /* I/O status block. */ + 0, /* Ast service routine. */ + 0, /* Ast parameter. */ + (char *)buf, /* P1 - buffer address. */ + len, /* P2 - buffer length. */ + 0, 0, 0, 0); if (status & STS$M_SUCCESS) status = iosb.iosb$w_status; if (!(status & STS$M_SUCCESS)) @@ -1966,91 +1966,91 @@ one_command (void) { off = 0; while (1) - { - /* Read data from connection. */ - status = sys$qiow (EFN$C_ENF, /* Event flag. */ - conn_channel, /* I/O channel. */ - IO$_READVBLK, /* I/O function code. */ - &iosb, /* I/O status block. */ - 0, /* Ast service routine. */ - 0, /* Ast parameter. */ - gdb_buf + off, /* P1 - buffer address. */ - sizeof (gdb_buf) - off, /* P2 - buffer leng. */ - 0, 0, 0, 0); - if (status & STS$M_SUCCESS) - status = iosb.iosb$w_status; - if (!(status & STS$M_SUCCESS)) - { - term_puts ("Failed to read data from connection\n" ); - LIB$SIGNAL (status); - } + { + /* Read data from connection. */ + status = sys$qiow (EFN$C_ENF, /* Event flag. */ + conn_channel, /* I/O channel. */ + IO$_READVBLK, /* I/O function code. */ + &iosb, /* I/O status block. */ + 0, /* Ast service routine. */ + 0, /* Ast parameter. */ + gdb_buf + off, /* P1 - buffer address. */ + sizeof (gdb_buf) - off, /* P2 - buffer leng. */ + 0, 0, 0, 0); + if (status & STS$M_SUCCESS) + status = iosb.iosb$w_status; + if (!(status & STS$M_SUCCESS)) + { + term_puts ("Failed to read data from connection\n" ); + LIB$SIGNAL (status); + } #ifdef RAW_DUMP - term_puts ("{: "); - term_write ((char *)gdb_buf + off, iosb.iosb$w_bcnt); - term_putnl (); + term_puts ("{: "); + term_write ((char *)gdb_buf + off, iosb.iosb$w_bcnt); + term_putnl (); #endif - gdb_blen = off + iosb.iosb$w_bcnt; - - if (off == 0) - { - /* Search for '$'. */ - for (dollar_off = 0; dollar_off < gdb_blen; dollar_off++) - if (gdb_buf[dollar_off] == '$') - break; - if (dollar_off >= gdb_blen) - { - /* Not found, discard the data. */ - off = 0; - continue; - } - /* Search for '#'. */ - for (sharp_off = dollar_off + 1; + gdb_blen = off + iosb.iosb$w_bcnt; + + if (off == 0) + { + /* Search for '$'. */ + for (dollar_off = 0; dollar_off < gdb_blen; dollar_off++) + if (gdb_buf[dollar_off] == '$') + break; + if (dollar_off >= gdb_blen) + { + /* Not found, discard the data. */ + off = 0; + continue; + } + /* Search for '#'. */ + for (sharp_off = dollar_off + 1; sharp_off < gdb_blen; sharp_off++) - if (gdb_buf[sharp_off] == '#') - break; - } - else if (sharp_off >= off) - { - /* Search for '#'. */ - for (; sharp_off < gdb_blen; sharp_off++) - if (gdb_buf[sharp_off] == '#') - break; - } - - /* Got packet with checksum. */ - if (sharp_off + 2 <= gdb_blen) - break; - - off = gdb_blen; - if (gdb_blen == sizeof (gdb_buf)) - { - /* Packet too large, discard. */ - off = 0; - } - } + if (gdb_buf[sharp_off] == '#') + break; + } + else if (sharp_off >= off) + { + /* Search for '#'. */ + for (; sharp_off < gdb_blen; sharp_off++) + if (gdb_buf[sharp_off] == '#') + break; + } + + /* Got packet with checksum. */ + if (sharp_off + 2 <= gdb_blen) + break; + + off = gdb_blen; + if (gdb_blen == sizeof (gdb_buf)) + { + /* Packet too large, discard. */ + off = 0; + } + } /* Validate and acknowledge a packet. */ { - unsigned char chksum = 0; - unsigned int i; - int v; - - for (i = dollar_off + 1; i < sharp_off; i++) - chksum += gdb_buf[i]; - v = hex2byte (gdb_buf + sharp_off + 1); - if (v != chksum) - { - term_puts ("Discard bad checksum packet\n"); - continue; - } - else - { - sock_write ((const unsigned char *)"+", 1); - break; - } + unsigned char chksum = 0; + unsigned int i; + int v; + + for (i = dollar_off + 1; i < sharp_off; i++) + chksum += gdb_buf[i]; + v = hex2byte (gdb_buf + sharp_off + 1); + if (v != chksum) + { + term_puts ("Discard bad checksum packet\n"); + continue; + } + else + { + sock_write ((const unsigned char *)"+", 1); + break; + } } } @@ -2088,12 +2088,12 @@ display_excp (struct chf64$signal_array *sig64, struct chf$mech_array *mech) char msg2[160]; unsigned short msg2len; struct dsc$descriptor_s msg2_desc = - { sizeof (msg2), DSC$K_DTYPE_T, DSC$K_CLASS_S, msg2}; + { sizeof (msg2), DSC$K_DTYPE_T, DSC$K_CLASS_S, msg2}; msg_desc.dsc$w_length = msglen; status = SYS$FAOL_64 (&msg_desc, &msg2len, &msg2_desc, - &sig64->chf64$q_sig_arg1); + &sig64->chf64$q_sig_arg1); if (status & STS$M_SUCCESS) - term_write (msg2, msg2len); + term_write (msg2, msg2len); } else term_puts ("no message"); @@ -2240,7 +2240,7 @@ do_debug (struct chf$mech_array *mech) static int excp_handler (struct chf$signal_array *sig, - struct chf$mech_array *mech) + struct chf$mech_array *mech) { struct chf64$signal_array *sig64 = (struct chf64$signal_array *)mech->chf$ph_mch_sig64_addr; @@ -2282,7 +2282,7 @@ excp_handler (struct chf$signal_array *sig, static unsigned int entry_prot; if (trace_entry) - term_puts ("initial entry breakpoint\n"); + term_puts ("initial entry breakpoint\n"); page_set_rw (entry_pc, 16, &entry_prot); ots$move ((void *)entry_pc, 16, entry_saved); @@ -2294,24 +2294,24 @@ excp_handler (struct chf$signal_array *sig, { case SS$_ACCVIO & STS$M_COND_ID: if (trace_excp <= 1) - display_excp (sig64, mech); + display_excp (sig64, mech); /* Fall through. */ case SS$_BREAK & STS$M_COND_ID: case SS$_OPCDEC & STS$M_COND_ID: case SS$_TBIT & STS$M_COND_ID: case SS$_DEBUG & STS$M_COND_ID: if (trace_excp > 1) - { + { int i; struct _intstk *intstk = (struct _intstk *)mech->chf$q_mch_esf_addr; - display_excp (sig64, mech); + display_excp (sig64, mech); - TERM_FAO (" intstk: !XH!/", intstk); - for (i = 0; i < cnt + 1; i++) + TERM_FAO (" intstk: !XH!/", intstk); + for (i = 0; i < cnt + 1; i++) TERM_FAO (" !XH!/", ((unsigned __int64 *)sig64)[i]); - } + } do_debug (mech); ret = SS$_CONTINUE_64; break; @@ -2350,10 +2350,10 @@ trace_init (void) /* Translate the logical name. */ status = SYS$TRNLNM (0, /* Attributes of the logical name. */ - (void *)&tabdesc, /* Logical name table. */ - (void *)&logdesc, /* Logical name. */ - 0, /* Access mode. */ - &item_lst); /* Item list. */ + (void *)&tabdesc, /* Logical name table. */ + (void *)&logdesc, /* Logical name. */ + 0, /* Access mode. */ + &item_lst); /* Item list. */ if (status == SS$_NOLOGNAM) return; if (!(status & STS$M_SUCCESS)) @@ -2364,11 +2364,11 @@ trace_init (void) { if ((i == len || resstring[i] == ',' || resstring[i] == ';') && i != start) - { + { int j; - sub_desc.dsc$a_pointer = resstring + start; - sub_desc.dsc$w_length = i - start; + sub_desc.dsc$a_pointer = resstring + start; + sub_desc.dsc$w_length = i - start; for (j = 0; j < NBR_DEBUG_FLAGS; j++) if (str$case_blind_compare (&sub_desc, @@ -2380,8 +2380,8 @@ trace_init (void) if (j == NBR_DEBUG_FLAGS) TERM_FAO ("GDBSTUB$TRACE: unknown directive !AS!/", &sub_desc); - start = i + 1; - } + start = i + 1; + } } TERM_FAO ("GDBSTUB$TRACE=!AD ->", len, resstring); @@ -2396,8 +2396,8 @@ trace_init (void) static int stub_start (unsigned __int64 *progxfer, void *cli_util, - EIHD *imghdr, IFD *imgfile, - unsigned int linkflag, unsigned int cliflag) + EIHD *imghdr, IFD *imgfile, + unsigned int linkflag, unsigned int cliflag) { static int initialized; int i; @@ -2579,7 +2579,7 @@ stub_start (unsigned __int64 *progxfer, void *cli_util, if (entry_pc == 0) { while (one_command () == 0) - ; + ; } /* We will see! */ |