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/avr-tdep.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/avr-tdep.c')
-rw-r--r-- | gdb/avr-tdep.c | 358 |
1 files changed, 179 insertions, 179 deletions
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c index 68b8487..2b0854c 100644 --- a/gdb/avr-tdep.c +++ b/gdb/avr-tdep.c @@ -382,12 +382,12 @@ static void avr_write_pc (struct regcache *regcache, CORE_ADDR val) { regcache_cooked_write_unsigned (regcache, AVR_PC_REGNUM, - avr_convert_iaddr_to_raw (val)); + avr_convert_iaddr_to_raw (val)); } static enum register_status avr_pseudo_register_read (struct gdbarch *gdbarch, readable_regcache *regcache, - int regnum, gdb_byte *buf) + int regnum, gdb_byte *buf) { ULONGEST val; enum register_status status; @@ -408,7 +408,7 @@ avr_pseudo_register_read (struct gdbarch *gdbarch, readable_regcache *regcache, static void avr_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, - int regnum, const gdb_byte *buf) + int regnum, const gdb_byte *buf) { ULONGEST val; @@ -433,87 +433,87 @@ avr_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, This information is stored in the avr_unwind_cache structure. Some devices lack the sbiw instruction, so on those replace this: - sbiw r28, XX + sbiw r28, XX with this: - subi r28,lo8(XX) - sbci r29,hi8(XX) + subi r28,lo8(XX) + sbci r29,hi8(XX) A typical AVR function prologue with a frame pointer might look like this: - push rXX ; saved regs - ... - push r28 - push r29 - in r28,__SP_L__ - in r29,__SP_H__ - sbiw r28,<LOCALS_SIZE> - in __tmp_reg__,__SREG__ - cli - out __SP_H__,r29 - out __SREG__,__tmp_reg__ - out __SP_L__,r28 + push rXX ; saved regs + ... + push r28 + push r29 + in r28,__SP_L__ + in r29,__SP_H__ + sbiw r28,<LOCALS_SIZE> + in __tmp_reg__,__SREG__ + cli + out __SP_H__,r29 + out __SREG__,__tmp_reg__ + out __SP_L__,r28 A typical AVR function prologue without a frame pointer might look like this: - push rXX ; saved regs - ... + push rXX ; saved regs + ... A main function prologue looks like this: - ldi r28,lo8(<RAM_ADDR> - <LOCALS_SIZE>) - ldi r29,hi8(<RAM_ADDR> - <LOCALS_SIZE>) - out __SP_H__,r29 - out __SP_L__,r28 + ldi r28,lo8(<RAM_ADDR> - <LOCALS_SIZE>) + ldi r29,hi8(<RAM_ADDR> - <LOCALS_SIZE>) + out __SP_H__,r29 + out __SP_L__,r28 A signal handler prologue looks like this: - push __zero_reg__ - push __tmp_reg__ - in __tmp_reg__, __SREG__ - push __tmp_reg__ - clr __zero_reg__ - push rXX ; save registers r18:r27, r30:r31 - ... - push r28 ; save frame pointer - push r29 - in r28, __SP_L__ - in r29, __SP_H__ - sbiw r28, <LOCALS_SIZE> - out __SP_H__, r29 - out __SP_L__, r28 - + push __zero_reg__ + push __tmp_reg__ + in __tmp_reg__, __SREG__ + push __tmp_reg__ + clr __zero_reg__ + push rXX ; save registers r18:r27, r30:r31 + ... + push r28 ; save frame pointer + push r29 + in r28, __SP_L__ + in r29, __SP_H__ + sbiw r28, <LOCALS_SIZE> + out __SP_H__, r29 + out __SP_L__, r28 + A interrupt handler prologue looks like this: - sei - push __zero_reg__ - push __tmp_reg__ - in __tmp_reg__, __SREG__ - push __tmp_reg__ - clr __zero_reg__ - push rXX ; save registers r18:r27, r30:r31 - ... - push r28 ; save frame pointer - push r29 - in r28, __SP_L__ - in r29, __SP_H__ - sbiw r28, <LOCALS_SIZE> - cli - out __SP_H__, r29 - sei - out __SP_L__, r28 + sei + push __zero_reg__ + push __tmp_reg__ + in __tmp_reg__, __SREG__ + push __tmp_reg__ + clr __zero_reg__ + push rXX ; save registers r18:r27, r30:r31 + ... + push r28 ; save frame pointer + push r29 + in r28, __SP_L__ + in r29, __SP_H__ + sbiw r28, <LOCALS_SIZE> + cli + out __SP_H__, r29 + sei + out __SP_L__, r28 A `-mcall-prologues' prologue looks like this (Note that the megas use a jmp instead of a rjmp, thus the prologue is one word larger since jmp is a 32 bit insn and rjmp is a 16 bit insn): - ldi r26,lo8(<LOCALS_SIZE>) - ldi r27,hi8(<LOCALS_SIZE>) - ldi r30,pm_lo8(.L_foo_body) - ldi r31,pm_hi8(.L_foo_body) - rjmp __prologue_saves__+RRR - .L_foo_body: */ + ldi r26,lo8(<LOCALS_SIZE>) + ldi r27,hi8(<LOCALS_SIZE>) + ldi r30,pm_lo8(.L_foo_body) + ldi r31,pm_hi8(.L_foo_body) + rjmp __prologue_saves__+RRR + .L_foo_body: */ /* Not really part of a prologue, but still need to scan for it, is when a function prologue moves values passed via registers as arguments to new registers. In this case, all local variables live in registers, so there may be some register saves. This is what it looks like: - movw rMM, rNN - ... + movw rMM, rNN + ... There could be multiple movw's. If the target doesn't have a movw insn, it will use two mov insns. This could be done after any of the above prologue @@ -569,9 +569,9 @@ avr_scan_prologue (struct gdbarch *gdbarch, CORE_ADDR pc_beg, CORE_ADDR pc_end, if (vpc + 4 + sizeof (img) < len && memcmp (prologue + vpc + 4, img, sizeof (img)) == 0) { - info->prologue_type = AVR_PROLOGUE_MAIN; - info->base = locals; - return pc_beg + 4; + info->prologue_type = AVR_PROLOGUE_MAIN; + info->base = locals; + return pc_beg + 4; } } } @@ -627,46 +627,46 @@ avr_scan_prologue (struct gdbarch *gdbarch, CORE_ADDR pc_beg, CORE_ADDR pc_end, insn = extract_unsigned_integer (&prologue[vpc + 8], 2, byte_order); /* rjmp __prologue_saves__+RRR */ if ((insn & 0xf000) == 0xc000) - { - /* Extract PC relative offset from RJMP */ - i = (insn & 0xfff) | (insn & 0x800 ? (-1 ^ 0xfff) : 0); - /* Convert offset to byte addressable mode */ - i *= 2; - /* Destination address */ - i += pc_beg + 10; - - if (body_addr != (pc_beg + 10)/2) - break; - - pc_offset += 2; - } + { + /* Extract PC relative offset from RJMP */ + i = (insn & 0xfff) | (insn & 0x800 ? (-1 ^ 0xfff) : 0); + /* Convert offset to byte addressable mode */ + i *= 2; + /* Destination address */ + i += pc_beg + 10; + + if (body_addr != (pc_beg + 10)/2) + break; + + pc_offset += 2; + } else if ((insn & 0xfe0e) == 0x940c) - { - /* Extract absolute PC address from JMP */ - i = (((insn & 0x1) | ((insn & 0x1f0) >> 3) << 16) + { + /* Extract absolute PC address from JMP */ + i = (((insn & 0x1) | ((insn & 0x1f0) >> 3) << 16) | (extract_unsigned_integer (&prologue[vpc + 10], 2, byte_order) & 0xffff)); - /* Convert address to byte addressable mode */ - i *= 2; + /* Convert address to byte addressable mode */ + i *= 2; - if (body_addr != (pc_beg + 12)/2) - break; + if (body_addr != (pc_beg + 12)/2) + break; - pc_offset += 4; - } + pc_offset += 4; + } else - break; + break; /* Resolve offset (in words) from __prologue_saves__ symbol. - Which is a pushes count in `-mcall-prologues' mode */ + Which is a pushes count in `-mcall-prologues' mode */ num_pushes = AVR_MAX_PUSHES - (i - BMSYMBOL_VALUE_ADDRESS (msymbol)) / 2; if (num_pushes > AVR_MAX_PUSHES) - { - fprintf_unfiltered (gdb_stderr, _("Num pushes too large: %d\n"), - num_pushes); - num_pushes = 0; - } + { + fprintf_unfiltered (gdb_stderr, _("Num pushes too large: %d\n"), + num_pushes); + num_pushes = 0; + } if (num_pushes) { @@ -705,22 +705,22 @@ avr_scan_prologue (struct gdbarch *gdbarch, CORE_ADDR pc_beg, CORE_ADDR pc_end, if (len >= sizeof (img) && memcmp (prologue, img, sizeof (img)) == 0) { - info->prologue_type = AVR_PROLOGUE_INTR; + info->prologue_type = AVR_PROLOGUE_INTR; vpc += sizeof (img); - info->saved_regs[AVR_SREG_REGNUM].addr = 3; - info->saved_regs[0].addr = 2; - info->saved_regs[1].addr = 1; - info->size += 3; + info->saved_regs[AVR_SREG_REGNUM].addr = 3; + info->saved_regs[0].addr = 2; + info->saved_regs[1].addr = 1; + info->size += 3; } else if (len >= sizeof (img) - 2 && memcmp (img + 2, prologue, sizeof (img) - 2) == 0) { - info->prologue_type = AVR_PROLOGUE_SIG; - vpc += sizeof (img) - 2; - info->saved_regs[AVR_SREG_REGNUM].addr = 3; - info->saved_regs[0].addr = 2; - info->saved_regs[1].addr = 1; - info->size += 2; + info->prologue_type = AVR_PROLOGUE_SIG; + vpc += sizeof (img) - 2; + info->saved_regs[AVR_SREG_REGNUM].addr = 3; + info->saved_regs[0].addr = 2; + info->saved_regs[1].addr = 1; + info->size += 2; } } @@ -750,17 +750,17 @@ avr_scan_prologue (struct gdbarch *gdbarch, CORE_ADDR pc_beg, CORE_ADDR pc_end, { insn = extract_unsigned_integer (&prologue[vpc], 2, byte_order); if (insn == 0xd000) /* rcall .+0 */ - { - info->size += gdbarch_tdep (gdbarch)->call_length; - vpc += 2; - } + { + info->size += gdbarch_tdep (gdbarch)->call_length; + vpc += 2; + } else if (insn == 0x920f || insn == 0x921f) /* push r0 or push r1 */ - { - info->size += 1; - vpc += 2; - } + { + info->size += 1; + vpc += 2; + } else - break; + break; } /* Second stage of the prologue scanning. @@ -786,7 +786,7 @@ avr_scan_prologue (struct gdbarch *gdbarch, CORE_ADDR pc_beg, CORE_ADDR pc_end, /* Third stage of the prologue scanning. (Really two stages). Scan for: sbiw r28,XX or subi r28,lo8(XX) - sbci r29,hi8(XX) + sbci r29,hi8(XX) in __tmp_reg__,__SREG__ cli out __SP_H__,r29 @@ -816,10 +816,10 @@ avr_scan_prologue (struct gdbarch *gdbarch, CORE_ADDR pc_beg, CORE_ADDR pc_end, insn = extract_unsigned_integer (&prologue[vpc], 2, byte_order); if ((insn & 0xff30) == 0x9720) /* sbiw r28,XXX */ - { - locals_size = (insn & 0xf) | ((insn & 0xc0) >> 2); - vpc += 2; - } + { + locals_size = (insn & 0xf) | ((insn & 0xc0) >> 2); + vpc += 2; + } else if ((insn & 0xf0f0) == 0x50c0) /* subi r28,lo8(XX) */ { locals_size = (insn & 0xf) | ((insn & 0xf00) >> 4); @@ -829,28 +829,28 @@ avr_scan_prologue (struct gdbarch *gdbarch, CORE_ADDR pc_beg, CORE_ADDR pc_end, locals_size += ((insn & 0xf) | ((insn & 0xf00) >> 4)) << 8; } else - return pc_beg + vpc; + return pc_beg + vpc; /* Scan the last part of the prologue. May not be present for interrupt - or signal handler functions, which is why we set the prologue type - when we saw the beginning of the prologue previously. */ + or signal handler functions, which is why we set the prologue type + when we saw the beginning of the prologue previously. */ if (vpc + sizeof (img_sig) < len && memcmp (prologue + vpc, img_sig, sizeof (img_sig)) == 0) - { - vpc += sizeof (img_sig); - } + { + vpc += sizeof (img_sig); + } else if (vpc + sizeof (img_int) < len && memcmp (prologue + vpc, img_int, sizeof (img_int)) == 0) - { - vpc += sizeof (img_int); - } + { + vpc += sizeof (img_int); + } if (vpc + sizeof (img) < len && memcmp (prologue + vpc, img, sizeof (img)) == 0) - { - info->prologue_type = AVR_PROLOGUE_NORMAL; - vpc += sizeof (img); - } + { + info->prologue_type = AVR_PROLOGUE_NORMAL; + vpc += sizeof (img); + } info->size += locals_size; @@ -864,11 +864,11 @@ avr_scan_prologue (struct gdbarch *gdbarch, CORE_ADDR pc_beg, CORE_ADDR pc_end, { insn = extract_unsigned_integer (&prologue[vpc], 2, byte_order); if ((insn & 0xff00) == 0x0100) /* movw rXX, rYY */ - continue; + continue; else if ((insn & 0xfc00) == 0x2c00) /* mov rXX, rYY */ - continue; + continue; else - break; + break; } return pc_beg + vpc; @@ -977,7 +977,7 @@ avr_return_value (struct gdbarch *gdbarch, struct value *function, static struct avr_unwind_cache * avr_frame_unwind_cache (struct frame_info *this_frame, - void **this_prologue_cache) + void **this_prologue_cache) { CORE_ADDR start_pc, current_pc; ULONGEST prev_sp; @@ -1009,20 +1009,20 @@ avr_frame_unwind_cache (struct frame_info *this_frame, ULONGEST high_base; /* High byte of FP */ /* The SP was moved to the FP. This indicates that a new frame - was created. Get THIS frame's FP value by unwinding it from - the next frame. */ + was created. Get THIS frame's FP value by unwinding it from + the next frame. */ this_base = get_frame_register_unsigned (this_frame, AVR_FP_REGNUM); high_base = get_frame_register_unsigned (this_frame, AVR_FP_REGNUM + 1); this_base += (high_base << 8); /* The FP points at the last saved register. Adjust the FP back - to before the first saved register giving the SP. */ + to before the first saved register giving the SP. */ prev_sp = this_base + info->size; } else { /* Assume that the FP is this frame's SP but with that pushed - stack space added back. */ + stack space added back. */ this_base = get_frame_register_unsigned (this_frame, AVR_SP_REGNUM); prev_sp = this_base + info->size; } @@ -1050,7 +1050,7 @@ avr_frame_unwind_cache (struct frame_info *this_frame, value. */ tdep = gdbarch_tdep (gdbarch); trad_frame_set_value (info->saved_regs, AVR_SP_REGNUM, - info->prev_sp - 1 + tdep->call_length); + info->prev_sp - 1 + tdep->call_length); return info; } @@ -1080,8 +1080,8 @@ avr_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame) static void avr_frame_this_id (struct frame_info *this_frame, - void **this_prologue_cache, - struct frame_id *this_id) + void **this_prologue_cache, + struct frame_id *this_id) { struct avr_unwind_cache *info = avr_frame_unwind_cache (this_frame, this_prologue_cache); @@ -1113,7 +1113,7 @@ avr_frame_prev_register (struct frame_info *this_frame, if (regnum == AVR_PC_REGNUM || regnum == AVR_PSEUDO_PC_REGNUM) { if (trad_frame_addr_p (info->saved_regs, AVR_PC_REGNUM)) - { + { /* Reading the return PC from the PC register is slightly abnormal. register_size(AVR_PC_REGNUM) says it is 4 bytes, but in reality, only two bytes (3 in upcoming mega256) are @@ -1133,18 +1133,18 @@ avr_frame_prev_register (struct frame_info *this_frame, struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); read_memory (info->saved_regs[AVR_PC_REGNUM].addr, - buf, tdep->call_length); + buf, tdep->call_length); /* Extract the PC read from memory as a big-endian. */ pc = 0; for (i = 0; i < tdep->call_length; i++) pc = (pc << 8) | buf[i]; - if (regnum == AVR_PC_REGNUM) - pc <<= 1; + if (regnum == AVR_PC_REGNUM) + pc <<= 1; return frame_unwind_got_constant (this_frame, regnum, pc); - } + } return frame_unwind_got_optimized (this_frame, regnum); } @@ -1264,8 +1264,8 @@ pop_stack_item (struct stack_item *si) static CORE_ADDR avr_push_dummy_call (struct gdbarch *gdbarch, struct value *function, - struct regcache *regcache, CORE_ADDR bp_addr, - int nargs, struct value **args, CORE_ADDR sp, + struct regcache *regcache, CORE_ADDR bp_addr, + int nargs, struct value **args, CORE_ADDR sp, function_call_return_method return_method, CORE_ADDR struct_addr) { @@ -1279,13 +1279,13 @@ avr_push_dummy_call (struct gdbarch *gdbarch, struct value *function, if (return_method == return_method_struct) { regcache_cooked_write_unsigned - (regcache, regnum--, (struct_addr >> 8) & 0xff); + (regcache, regnum--, (struct_addr >> 8) & 0xff); regcache_cooked_write_unsigned - (regcache, regnum--, struct_addr & 0xff); + (regcache, regnum--, struct_addr & 0xff); /* SP being post decremented, we need to reserve one byte so that the - return address won't overwrite the result (or vice-versa). */ + return address won't overwrite the result (or vice-versa). */ if (sp == struct_addr) - sp--; + sp--; } for (i = 0; i < nargs; i++) @@ -1298,30 +1298,30 @@ avr_push_dummy_call (struct gdbarch *gdbarch, struct value *function, int len = TYPE_LENGTH (type); /* Calculate the potential last register needed. - E.g. For length 2, registers regnum and regnum-1 (say 25 and 24) - shall be used. So, last needed register will be regnum-1(24). */ + E.g. For length 2, registers regnum and regnum-1 (say 25 and 24) + shall be used. So, last needed register will be regnum-1(24). */ last_regnum = regnum - (len + (len & 1)) + 1; /* If there are registers available, use them. Once we start putting - stuff on the stack, all subsequent args go on stack. */ + stuff on the stack, all subsequent args go on stack. */ if ((si == NULL) && (last_regnum >= AVR_LAST_ARG_REGNUM)) - { - /* Skip a register for odd length args. */ - if (len & 1) - regnum--; - - /* Write MSB of argument into register and subsequent bytes in - decreasing register numbers. */ - for (j = 0; j < len; j++) - regcache_cooked_write_unsigned - (regcache, regnum--, contents[len - j - 1]); - } + { + /* Skip a register for odd length args. */ + if (len & 1) + regnum--; + + /* Write MSB of argument into register and subsequent bytes in + decreasing register numbers. */ + for (j = 0; j < len; j++) + regcache_cooked_write_unsigned + (regcache, regnum--, contents[len - j - 1]); + } /* No registers available, push the args onto the stack. */ else - { - /* From here on, we don't care about regnum. */ - si = push_stack_item (si, contents, len); - } + { + /* From here on, we don't care about regnum. */ + si = push_stack_item (si, contents, len); + } } /* Push args onto the stack. */ @@ -1591,18 +1591,18 @@ avr_io_reg_read_command (const char *args, int from_tty) /* how many registers this round? */ int j = step; if ((i+j) >= nreg) - j = nreg - i; /* last block is less than 8 registers */ + j = nreg - i; /* last block is less than 8 registers */ snprintf (query, sizeof (query) - 1, "avr.io_reg:%x,%x", i, j); buf = target_read_alloc (current_top_target (), TARGET_OBJECT_AVR, query); if (!buf) - { - fprintf_unfiltered (gdb_stderr, + { + fprintf_unfiltered (gdb_stderr, _("ERR: error reading avr.io_reg:%x,%x\n"), i, j); - return; - } + return; + } const char *p = (const char *) buf->data (); for (int k = i; k < (i + j); k++) |