diff --git a/llvm/lib/Target/AVR/AVRInstrFormats.td b/llvm/lib/Target/AVR/AVRInstrFormats.td
--- a/llvm/lib/Target/AVR/AVRInstrFormats.td
+++ b/llvm/lib/Target/AVR/AVRInstrFormats.td
@@ -332,6 +332,8 @@
   let Inst{10-9} = A{5-4};
   let Inst{8-4} = d;
   let Inst{3-0} = A{3-0};
+
+  let DecoderMethod = "decodeFIORdA";
 }
 
 //===----------------------------------------------------------------------===//
@@ -350,6 +352,8 @@
   let Inst{10-9} = A{5-4};
   let Inst{8-4} = r;
   let Inst{3-0} = A{3-0};
+
+  let DecoderMethod = "decodeFIOARr";
 }
 
 //===----------------------------------------------------------------------===//
@@ -374,6 +378,8 @@
 
   let Inst{3} = A{0};
   let Inst{2-0} = b{2-0};
+
+  let DecoderMethod = "decodeFIOBIT";
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/llvm/lib/Target/AVR/Disassembler/AVRDisassembler.cpp b/llvm/lib/Target/AVR/Disassembler/AVRDisassembler.cpp
--- a/llvm/lib/Target/AVR/Disassembler/AVRDisassembler.cpp
+++ b/llvm/lib/Target/AVR/Disassembler/AVRDisassembler.cpp
@@ -95,8 +95,50 @@
   return MCDisassembler::Success;
 }
 
+static DecodeStatus decodeFIOARr(MCInst &Inst, unsigned Insn,
+                                 uint64_t Address, const void *Decoder);
+
+static DecodeStatus decodeFIORdA(MCInst &Inst, unsigned Insn,
+                                 uint64_t Address, const void *Decoder);
+
+static DecodeStatus decodeFIOBIT(MCInst &Inst, unsigned Insn,
+                                 uint64_t Address, const void *Decoder);
+
 #include "AVRGenDisassemblerTables.inc"
 
+static DecodeStatus decodeFIOARr(MCInst &Inst, unsigned Insn,
+                                 uint64_t Address, const void *Decoder) {
+  unsigned addr = 0;
+  addr |= fieldFromInstruction(Insn, 0, 4);
+  addr |= fieldFromInstruction(Insn, 9, 2) << 4;
+  unsigned reg = fieldFromInstruction(Insn, 4, 5);
+  Inst.addOperand(MCOperand::createImm(addr));
+  if (DecodeGPR8RegisterClass(Inst, reg, Address, Decoder) == MCDisassembler::Fail)
+    return MCDisassembler::Fail;
+  return MCDisassembler::Success;
+}
+
+static DecodeStatus decodeFIORdA(MCInst &Inst, unsigned Insn,
+                                 uint64_t Address, const void *Decoder) {
+  unsigned addr = 0;
+  addr |= fieldFromInstruction(Insn, 0, 4);
+  addr |= fieldFromInstruction(Insn, 9, 2) << 4;
+  unsigned reg = fieldFromInstruction(Insn, 4, 5);
+  if (DecodeGPR8RegisterClass(Inst, reg, Address, Decoder) == MCDisassembler::Fail)
+    return MCDisassembler::Fail;
+  Inst.addOperand(MCOperand::createImm(addr));
+  return MCDisassembler::Success;
+}
+
+static DecodeStatus decodeFIOBIT(MCInst &Inst, unsigned Insn,
+                                 uint64_t Address, const void *Decoder) {
+  unsigned addr = fieldFromInstruction(Insn, 3, 5);
+  unsigned b = fieldFromInstruction(Insn, 0, 3);
+  Inst.addOperand(MCOperand::createImm(addr));
+  Inst.addOperand(MCOperand::createImm(b));
+  return MCDisassembler::Success;
+}
+
 static DecodeStatus readInstruction16(ArrayRef<uint8_t> Bytes, uint64_t Address,
                                       uint64_t &Size, uint32_t &Insn) {
   if (Bytes.size() < 2) {
diff --git a/llvm/test/MC/AVR/inst-cbi.s b/llvm/test/MC/AVR/inst-cbi.s
--- a/llvm/test/MC/AVR/inst-cbi.s
+++ b/llvm/test/MC/AVR/inst-cbi.s
@@ -1,20 +1,36 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck -check-prefix=CHECK-INST %s
 
 
 foo:
 
   cbi 3, 5
   cbi 1, 1
-  cbi 0, 0
   cbi 7, 2
+  cbi 0, 0
+  cbi 31, 0
+  cbi 0, 7
+  cbi 31, 7
 
   cbi bar-2, 2
 
 ; CHECK: cbi 3, 5                  ; encoding: [0x1d,0x98]
 ; CHECK: cbi 1, 1                  ; encoding: [0x09,0x98]
-; CHECK: cbi 0, 0                  ; encoding: [0x00,0x98]
 ; CHECK: cbi 7, 2                  ; encoding: [0x3a,0x98]
+; CHECK: cbi 0, 0                  ; encoding: [0x00,0x98]
+; CHECK: cbi 31, 0                 ; encoding: [0xf8,0x98]
+; CHECK: cbi 0, 7                  ; encoding: [0x07,0x98]
+; CHECK: cbi 31, 7                 ; encoding: [0xff,0x98]
 
 ; CHECK: cbi bar-2, 2              ; encoding: [0bAAAAA010,0x98]
 ; CHECK:                           ;   fixup A - offset: 0, value: bar-2, kind: fixup_port5
 
+; CHECK-INST: cbi 3, 5
+; CHECK-INST: cbi 1, 1
+; CHECK-INST: cbi 7, 2
+; CHECK-INST: cbi 0, 0
+; CHECK-INST: cbi 31, 0
+; CHECK-INST: cbi 0, 7
+; CHECK-INST: cbi 31, 7
+
+; CHECK-INST: cbi 0, 2
diff --git a/llvm/test/MC/AVR/inst-in.s b/llvm/test/MC/AVR/inst-in.s
--- a/llvm/test/MC/AVR/inst-in.s
+++ b/llvm/test/MC/AVR/inst-in.s
@@ -1,4 +1,5 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck -check-prefix=CHECK-INST %s
 
 
 foo:
@@ -7,6 +8,9 @@
   in r9, 6
   in r5, 32
   in r0, 0
+  in r31, 0
+  in r0, 63
+  in r31, 63
 
   in r20, foo+1
 
@@ -14,7 +18,19 @@
 ; CHECK: in r9, 6                   ; encoding: [0x96,0xb0]
 ; CHECK: in r5, 32                  ; encoding: [0x50,0xb4]
 ; CHECK: in r0, 0                   ; encoding: [0x00,0xb0]
+; CHECK: in r31, 0                  ; encoding: [0xf0,0xb1]
+; CHECK: in r0, 63                  ; encoding: [0x0f,0xb6]
+; CHECK: in r31, 63                 ; encoding: [0xff,0xb7]
 
 ; CHECK: in r20, foo+1              ; encoding: [0x40'A',0xb1'A']
 ; CHECK:                            ;   fixup A - offset: 0, value: foo+1, kind: fixup_port6
 
+; CHECK-INST: in r2, 4
+; CHECK-INST: in r9, 6
+; CHECK-INST: in r5, 32
+; CHECK-INST: in r0, 0
+; CHECK-INST: in r31, 0
+; CHECK-INST: in r0, 63
+; CHECK-INST: in r31, 63
+
+; CHECK-INST: in r20, 0
diff --git a/llvm/test/MC/AVR/inst-out.s b/llvm/test/MC/AVR/inst-out.s
--- a/llvm/test/MC/AVR/inst-out.s
+++ b/llvm/test/MC/AVR/inst-out.s
@@ -1,4 +1,5 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck -check-prefix=CHECK-INST %s
 
 
 foo:
@@ -7,6 +8,9 @@
   out 6,  r9
   out 32, r5
   out 0,  r0
+  out 0,  r31
+  out 63, r0
+  out 63, r31
 
   out bar-8, r29
 
@@ -14,7 +18,19 @@
 ; CHECK: out 6,  r9                  ; encoding: [0x96,0xb8]
 ; CHECK: out 32, r5                  ; encoding: [0x50,0xbc]
 ; CHECK: out 0,  r0                  ; encoding: [0x00,0xb8]
+; CHECK: out 0,  r31                 ; encoding: [0xf0,0xb9]
+; CHECK: out 63, r0                  ; encoding: [0x0f,0xbe]
+; CHECK: out 63, r31                 ; encoding: [0xff,0xbf]
 
 ; CHECK: out bar-8, r29              ; encoding: [0xd0'A',0xb9'A']
 ; CHECK:                             ;   fixup A - offset: 0, value: bar-8, kind: fixup_port6
 
+; CHECK-INST: out 4,  r2
+; CHECK-INST: out 6,  r9
+; CHECK-INST: out 32, r5
+; CHECK-INST: out 0,  r0
+; CHECK-INST: out 0,  r31
+; CHECK-INST: out 63, r0
+; CHECK-INST: out 63, r31
+
+; CHECK-INST: out 0, r29
diff --git a/llvm/test/MC/AVR/inst-sbi.s b/llvm/test/MC/AVR/inst-sbi.s
--- a/llvm/test/MC/AVR/inst-sbi.s
+++ b/llvm/test/MC/AVR/inst-sbi.s
@@ -1,20 +1,36 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck -check-prefix=CHECK-INST %s
 
 
 foo:
 
   sbi 3, 5
   sbi 1, 1
-  sbi 0, 0
   sbi 7, 2
+  sbi 0, 0
+  sbi 0, 7
+  sbi 31, 0
+  sbi 31, 7
 
   sbi main, 0
 
 ; CHECK: sbi 3, 5                  ; encoding: [0x1d,0x9a]
 ; CHECK: sbi 1, 1                  ; encoding: [0x09,0x9a]
-; CHECK: sbi 0, 0                  ; encoding: [0x00,0x9a]
 ; CHECK: sbi 7, 2                  ; encoding: [0x3a,0x9a]
+; CHECK: sbi 0, 0                  ; encoding: [0x00,0x9a]
+; CHECK: sbi 0, 7                  ; encoding: [0x07,0x9a]
+; CHECK: sbi 31, 0                 ; encoding: [0xf8,0x9a]
+; CHECK: sbi 31, 7                 ; encoding: [0xff,0x9a]
 
 ; CHECK: sbi main, 0               ; encoding: [0bAAAAA000,0x9a]
 ; CHECK:                           ;   fixup A - offset: 0, value: main, kind: fixup_port5
 
+; CHECK-INST: sbi 3, 5
+; CHECK-INST: sbi 1, 1
+; CHECK-INST: sbi 7, 2
+; CHECK-INST: sbi 0, 0
+; CHECK-INST: sbi 0, 7
+; CHECK-INST: sbi 31, 0
+; CHECK-INST: sbi 31, 7
+
+; CHECK-INST: sbi 0, 0
diff --git a/llvm/test/MC/AVR/inst-sbic.s b/llvm/test/MC/AVR/inst-sbic.s
--- a/llvm/test/MC/AVR/inst-sbic.s
+++ b/llvm/test/MC/AVR/inst-sbic.s
@@ -1,4 +1,5 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck -check-prefix=CHECK-INST %s
 
 
 foo:
@@ -7,6 +8,9 @@
   sbic 6,  2
   sbic 16, 5
   sbic 0,  0
+  sbic 31, 0
+  sbic 0,  7
+  sbic 31, 7
 
   sbic foo+1, 1
 
@@ -14,6 +18,19 @@
 ; CHECK: sbic 6,  2                  ; encoding: [0x32,0x99]
 ; CHECK: sbic 16, 5                  ; encoding: [0x85,0x99]
 ; CHECK: sbic 0,  0                  ; encoding: [0x00,0x99]
+; CHECK: sbic 31, 0                  ; encoding: [0xf8,0x99]
+; CHECK: sbic 0,  7                  ; encoding: [0x07,0x99]
+; CHECK: sbic 31, 7                  ; encoding: [0xff,0x99]
 
 ; CHECK: sbic foo+1, 1               ; encoding: [0bAAAAA001,0x99]
 ; CHECK:                             ;   fixup A - offset: 0, value: foo+1, kind: fixup_port5
+
+; CHECK-INST: sbic 4,  3
+; CHECK-INST: sbic 6,  2
+; CHECK-INST: sbic 16, 5
+; CHECK-INST: sbic 0,  0
+; CHECK-INST: sbic 31, 0
+; CHECK-INST: sbic 0,  7
+; CHECK-INST: sbic 31, 7
+
+; CHECK-INST: sbic 0, 1
diff --git a/llvm/test/MC/AVR/inst-sbis.s b/llvm/test/MC/AVR/inst-sbis.s
--- a/llvm/test/MC/AVR/inst-sbis.s
+++ b/llvm/test/MC/AVR/inst-sbis.s
@@ -1,4 +1,5 @@
 ; RUN: llvm-mc -triple avr -show-encoding < %s | FileCheck %s
+; RUN: llvm-mc -filetype=obj -triple avr < %s | llvm-objdump -d - | FileCheck -check-prefix=CHECK-INST %s
 
 
 foo:
@@ -6,6 +7,9 @@
   sbis 6,  2
   sbis 16, 5
   sbis 0,  0
+  sbis 31, 0
+  sbis 0,  7
+  sbis 31, 7
 
   sbis FOO+4, 7
 
@@ -13,6 +17,19 @@
 ; CHECK: sbis 6,  2                  ; encoding: [0x32,0x9b]
 ; CHECK: sbis 16, 5                  ; encoding: [0x85,0x9b]
 ; CHECK: sbis 0,  0                  ; encoding: [0x00,0x9b]
+; CHECK: sbis 31, 0                  ; encoding: [0xf8,0x9b]
+; CHECK: sbis 0,  7                  ; encoding: [0x07,0x9b]
+; CHECK: sbis 31, 7                  ; encoding: [0xff,0x9b]
 
 ; CHECK: sbis FOO+4, 7               ; encoding: [0bAAAAA111,0x9b]
 ; CHECK:                             ;   fixup A - offset: 0, value: FOO+4, kind: fixup_port5
+
+; CHECK-INST: sbis 4,  3
+; CHECK-INST: sbis 6,  2
+; CHECK-INST: sbis 16, 5
+; CHECK-INST: sbis 0,  0
+; CHECK-INST: sbis 31, 0
+; CHECK-INST: sbis 0,  7
+; CHECK-INST: sbis 31, 7
+
+; CHECK-INST: sbis 0, 7