From 84f9f8c33021593afd79fc89cc419db44f7bc112 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 9 May 2018 15:50:29 +0930 Subject: [PATCH] PR22069, Several instances of register accidentally spelled as regsiter PR 22069 binutils/ * od-macho.c (dump_unwind_encoding_x86): Adjust for macro renaming. cpu/ChangeLog * or1kcommon.cpu (spr-reg-info): Typo fix. include/ChangeLog * mach-o/unwind.h (MACH_O_UNWIND_X86_64_RBP_FRAME_REGISTERS): Rename from MACH_O_UNWIND_X86_64_RBP_FRAME_REGSITERS. (MACH_O_UNWIND_X86_EBP_FRAME_REGISTERS): Rename from MACH_O_UNWIND_X86_EBP_FRAME_REGSITERS. opcodes/ChangeLog * cr16-opc.c (cr16_instruction): Comment typo fix. * hppa-dis.c (print_insn_hppa): Likewise. sim/ppc/ChangeLog * e500_registers.h: Comment typo fix. * ppc-instructions (ppc_insn_mfcr): Likewise. --- binutils/ChangeLog | 4 ++++ binutils/od-macho.c | 2 +- cpu/ChangeLog | 4 ++++ cpu/or1kcommon.cpu | 2 +- include/ChangeLog | 7 +++++++ include/mach-o/unwind.h | 4 ++-- opcodes/ChangeLog | 5 +++++ opcodes/cr16-opc.c | 2 +- opcodes/hppa-dis.c | 2 +- sim/ppc/ChangeLog | 5 +++++ sim/ppc/e500_registers.h | 2 +- sim/ppc/ppc-instructions | 2 +- 12 files changed, 33 insertions(+), 8 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index d2d25532db..4cc4cba3dd 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,7 @@ +2018-05-09 Sebastian Rasmussen + + * od-macho.c (dump_unwind_encoding_x86): Adjust for macro renaming. + 2018-05-08 Alan Modra PR 23141 diff --git a/binutils/od-macho.c b/binutils/od-macho.c index fb2ed70dd6..b0c39b3956 100644 --- a/binutils/od-macho.c +++ b/binutils/od-macho.c @@ -1688,7 +1688,7 @@ dump_unwind_encoding_x86 (unsigned int encoding, unsigned int sz, unsigned int regs; char pfx = sz == 8 ? 'R' : 'E'; - regs = encoding & MACH_O_UNWIND_X86_64_RBP_FRAME_REGSITERS; + regs = encoding & MACH_O_UNWIND_X86_64_RBP_FRAME_REGISTERS printf (" %cSP frame", pfx); if (regs != 0) { diff --git a/cpu/ChangeLog b/cpu/ChangeLog index 5581d87ea1..affb4d70e0 100644 --- a/cpu/ChangeLog +++ b/cpu/ChangeLog @@ -1,3 +1,7 @@ +2018-05-09 Sebastian Rasmussen + + * or1kcommon.cpu (spr-reg-info): Typo fix. + 2018-03-03 Alan Modra * frv.opc: Include opintl.h. diff --git a/cpu/or1kcommon.cpu b/cpu/or1kcommon.cpu index ced70c3509..86d440c385 100644 --- a/cpu/or1kcommon.cpu +++ b/cpu/or1kcommon.cpu @@ -170,7 +170,7 @@ (SYS DCFGR #x007 "Debug configuration register") (SYS PCCFGR #x008 "Performance counters configuration register") (SYS NPC #x010 "Next program counter") - (SYS SR #x011 "Supervision Regsiter") + (SYS SR #x011 "Supervision Register") (SYS PPC #x012 "Previous program counter") (SYS FPCSR #x014 "Floating point control status register") (.unsplice diff --git a/include/ChangeLog b/include/ChangeLog index 5dceeb15ac..3e74a7679f 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,10 @@ +2018-05-09 Sebastian Rasmussen + + * mach-o/unwind.h (MACH_O_UNWIND_X86_64_RBP_FRAME_REGISTERS): + Rename from MACH_O_UNWIND_X86_64_RBP_FRAME_REGSITERS. + (MACH_O_UNWIND_X86_EBP_FRAME_REGISTERS): Rename from + MACH_O_UNWIND_X86_EBP_FRAME_REGSITERS. + 2018-05-08 Jim Wilson * opcode/riscv-opc.h (MATCH_C_SRLI64, MASK_C_SRLI64): New. diff --git a/include/mach-o/unwind.h b/include/mach-o/unwind.h index da64c16eaf..d95dc98710 100644 --- a/include/mach-o/unwind.h +++ b/include/mach-o/unwind.h @@ -37,7 +37,7 @@ %rbp-2040 (offset is encoded in offset bits * 8). Registers saved are encoded in registers bits, 3 bits per register. */ #define MACH_O_UNWIND_X86_64_MODE_RBP_FRAME 0x01000000 -#define MACH_O_UNWIND_X86_64_RBP_FRAME_REGSITERS 0x00007FFF +#define MACH_O_UNWIND_X86_64_RBP_FRAME_REGISTERS 0x00007FFF #define MACH_O_UNWIND_X86_64_RBP_FRAME_OFFSET 0x00FF0000 /* Frameless function, with a small stack size. */ @@ -75,7 +75,7 @@ %ebp-240 (offset is encoded in offset bits * 4). Registers saved are encoded in registers bits, 3 bits per register. */ #define MACH_O_UNWIND_X86_MODE_EBP_FRAME 0x01000000 -#define MACH_O_UNWIND_X86_EBP_FRAME_REGSITERS 0x00007FFF +#define MACH_O_UNWIND_X86_EBP_FRAME_REGISTERS 0x00007FFF #define MACH_O_UNWIND_X86_EBP_FRAME_OFFSET 0x00FF0000 /* Frameless function, with a small stack size. */ diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 277bfb1b0d..4dfd5011a9 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2018-05-09 Sebastian Rasmussen + + * cr16-opc.c (cr16_instruction): Comment typo fix. + * hppa-dis.c (print_insn_hppa): Likewise. + 2018-05-08 Jim Wilson * riscv-opc.c (match_c_slli, match_slli_as_c_slli): New. diff --git a/opcodes/cr16-opc.c b/opcodes/cr16-opc.c index 1875379223..b477dbe926 100644 --- a/opcodes/cr16-opc.c +++ b/opcodes/cr16-opc.c @@ -276,7 +276,7 @@ const inst cr16_instruction[] = {"storm", 1, 0x16, 19, NO_TYPE_INS | REG_LIST, {{uimm3_1,16}}}, {"stormp", 1, 0x17, 19, NO_TYPE_INS | REG_LIST, {{uimm3_1,16}}}, - /* Processor Regsiter Manipulation instructions */ + /* Processor Register Manipulation instructions */ /* opc16 reg, preg */ {"lpr", 2, 0x00140, 12, NO_TYPE_INS, {{regr,0}, {pregr,4}}}, /* opc16 regp, pregp */ diff --git a/opcodes/hppa-dis.c b/opcodes/hppa-dis.c index 48003dcb33..3658eec331 100644 --- a/opcodes/hppa-dis.c +++ b/opcodes/hppa-dis.c @@ -425,7 +425,7 @@ print_insn_hppa (bfd_vma memaddr, disassemble_info *info) fput_fp_reg (GET_FIELD (insn, 6, 10), info); break; - /* 'fA' will not generate a space before the regsiter + /* 'fA' will not generate a space before the register name. Normally that is fine. Except that it causes problems with xmpyu which has no FP format completer. */ diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 9573e7ba04..8ecdab8a77 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,8 @@ +2018-05-09 Sebastian Rasmussen + + * e500_registers.h: Comment typo fix. + * ppc-instructions (ppc_insn_mfcr): Likewise. + 2017-09-05 John Baldwin PR sim/20863 diff --git a/sim/ppc/e500_registers.h b/sim/ppc/e500_registers.h index c06a88fee0..ee586350fb 100644 --- a/sim/ppc/e500_registers.h +++ b/sim/ppc/e500_registers.h @@ -28,7 +28,7 @@ enum { msr_e500_spu_enable = BIT(38) }; -/* E500 regsiters. */ +/* E500 registers. */ enum { diff --git a/sim/ppc/ppc-instructions b/sim/ppc/ppc-instructions index 5e6d21df56..9f9773477f 100644 --- a/sim/ppc/ppc-instructions +++ b/sim/ppc/ppc-instructions @@ -734,7 +734,7 @@ void::model-function::ppc_insn_to_spr:itable_index index, model_data *model_ptr, busy_ptr->nr_writebacks = 1; TRACE(trace_model,("Making register %s busy.\n", spr_name(nSPR))); -# Schedule a MFCR instruction that moves the CR into an integer regsiter +# Schedule a MFCR instruction that moves the CR into an integer register void::model-function::ppc_insn_mfcr:itable_index index, model_data *model_ptr, unsigned32 int_mask const unsigned32 cr_mask = 0xff; model_busy *busy_ptr; -- 2.34.1