diff options
Diffstat (limited to 'src/cmd/asm/internal/asm/asm.go')
| -rw-r--r-- | src/cmd/asm/internal/asm/asm.go | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/cmd/asm/internal/asm/asm.go b/src/cmd/asm/internal/asm/asm.go index c9c64203ae..3b41bb9bb1 100644 --- a/src/cmd/asm/internal/asm/asm.go +++ b/src/cmd/asm/internal/asm/asm.go @@ -403,7 +403,7 @@ func (p *Parser) asmJump(op obj.As, cond string, a []obj.Addr) { fallthrough default: - p.errorf("wrong number of arguments to %s instruction", obj.Aconv(op)) + p.errorf("wrong number of arguments to %s instruction", op) return } switch { @@ -476,7 +476,7 @@ func (p *Parser) branch(jmp, target *obj.Prog) { // asmInstruction assembles an instruction. // MOVW R9, (R10) func (p *Parser) asmInstruction(op obj.As, cond string, a []obj.Addr) { - // fmt.Printf("%s %+v\n", obj.Aconv(op), a) + // fmt.Printf("%s %+v\n", op, a) prog := &obj.Prog{ Ctxt: p.ctxt, Lineno: p.histLineNum, @@ -525,7 +525,7 @@ func (p *Parser) asmInstruction(op obj.As, cond string, a []obj.Addr) { prog.To = a[1] break } - p.errorf("unrecognized addressing for %s", obj.Aconv(op)) + p.errorf("unrecognized addressing for %s", op) return } if arch.IsARMFloatCmp(op) { @@ -572,7 +572,7 @@ func (p *Parser) asmInstruction(op obj.As, cond string, a []obj.Addr) { // Catch missing operand here, because we store immediate as part of From3, and can't distinguish // missing operand from legal value 0 in obj/x86/asm6. if arch.IsAMD4OP(op) { - p.errorf("4 operands required, but only 3 are provided for %s instruction", obj.Aconv(op)) + p.errorf("4 operands required, but only 3 are provided for %s instruction", op) } prog.From = a[0] prog.From3 = newAddr(a[1]) @@ -583,7 +583,7 @@ func (p *Parser) asmInstruction(op obj.As, cond string, a []obj.Addr) { prog.From = a[0] prog.To = a[1] if a[2].Type != obj.TYPE_REG { - p.errorf("invalid addressing modes for third operand to %s instruction, must be register", obj.Aconv(op)) + p.errorf("invalid addressing modes for third operand to %s instruction, must be register", op) return } prog.RegTo2 = a[2].Reg @@ -619,7 +619,7 @@ func (p *Parser) asmInstruction(op obj.As, cond string, a []obj.Addr) { prog.From3 = newAddr(a[1]) prog.To = a[2] default: - p.errorf("invalid addressing modes for %s instruction", obj.Aconv(op)) + p.errorf("invalid addressing modes for %s instruction", op) return } case sys.S390X: @@ -656,10 +656,10 @@ func (p *Parser) asmInstruction(op obj.As, cond string, a []obj.Addr) { prog.From = a[1] prog.From3 = newAddr(a[2]) if a[0].Type != obj.TYPE_CONST { - p.errorf("first operand must be an immediate in %s instruction", obj.Aconv(op)) + p.errorf("first operand must be an immediate in %s instruction", op) } if prog.From3.Type != obj.TYPE_REG { - p.errorf("third operand must be a register in %s instruction", obj.Aconv(op)) + p.errorf("third operand must be a register in %s instruction", op) } prog.From3.Offset = int64(p.getImmediate(prog, op, &a[0])) prog.To = a[3] @@ -690,7 +690,7 @@ func (p *Parser) asmInstruction(op obj.As, cond string, a []obj.Addr) { prog.To = a[3] break } - p.errorf("can't handle %s instruction with 4 operands", obj.Aconv(op)) + p.errorf("can't handle %s instruction with 4 operands", op) return case 5: if p.arch.Family == sys.PPC64 && arch.IsPPC64RLD(op) { @@ -712,7 +712,7 @@ func (p *Parser) asmInstruction(op obj.As, cond string, a []obj.Addr) { prog.To = a[4] break } - p.errorf("can't handle %s instruction with 5 operands", obj.Aconv(op)) + p.errorf("can't handle %s instruction with 5 operands", op) return case 6: if p.arch.Family == sys.ARM && arch.IsARMMRC(op) { @@ -736,7 +736,7 @@ func (p *Parser) asmInstruction(op obj.As, cond string, a []obj.Addr) { } fallthrough default: - p.errorf("can't handle %s instruction with %d operands", obj.Aconv(op), len(a)) + p.errorf("can't handle %s instruction with %d operands", op, len(a)) return } @@ -771,7 +771,7 @@ func (p *Parser) getConstantPseudo(pseudo string, addr *obj.Addr) int64 { // getConstant checks that addr represents a plain constant and returns its value. func (p *Parser) getConstant(prog *obj.Prog, op obj.As, addr *obj.Addr) int64 { if addr.Type != obj.TYPE_MEM || addr.Name != 0 || addr.Reg != 0 || addr.Index != 0 { - p.errorf("%s: expected integer constant; found %s", obj.Aconv(op), obj.Dconv(prog, addr)) + p.errorf("%s: expected integer constant; found %s", op, obj.Dconv(prog, addr)) } return addr.Offset } @@ -779,7 +779,7 @@ func (p *Parser) getConstant(prog *obj.Prog, op obj.As, addr *obj.Addr) int64 { // getImmediate checks that addr represents an immediate constant and returns its value. func (p *Parser) getImmediate(prog *obj.Prog, op obj.As, addr *obj.Addr) int64 { if addr.Type != obj.TYPE_CONST || addr.Name != 0 || addr.Reg != 0 || addr.Index != 0 { - p.errorf("%s: expected immediate constant; found %s", obj.Aconv(op), obj.Dconv(prog, addr)) + p.errorf("%s: expected immediate constant; found %s", op, obj.Dconv(prog, addr)) } return addr.Offset } @@ -787,7 +787,7 @@ func (p *Parser) getImmediate(prog *obj.Prog, op obj.As, addr *obj.Addr) int64 { // getRegister checks that addr represents a register and returns its value. func (p *Parser) getRegister(prog *obj.Prog, op obj.As, addr *obj.Addr) int16 { if addr.Type != obj.TYPE_REG || addr.Offset != 0 || addr.Name != 0 || addr.Index != 0 { - p.errorf("%s: expected register; found %s", obj.Aconv(op), obj.Dconv(prog, addr)) + p.errorf("%s: expected register; found %s", op, obj.Dconv(prog, addr)) } return addr.Reg } |