[PATCH] D17200: [mips] Implemented the .hword directive.

[Scott Egerton via llvm-commits]

s.egerton created this revision.
s.egerton added reviewers: dsanders, vkalintiris.
s.egerton added a subscriber: llvm-commits.
Herald added a subscriber: dsanders.

In order to pass the tests, this required marking R_MIPS_16 relocations
as needing to point to the symbol and not the section.

http://reviews.llvm.org/D17200

Files:
  lib/Target/Mips/AsmParser/MipsAsmParser.cpp
  lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
  test/MC/Mips/mips-data-directives.s

Index: test/MC/Mips/mips-data-directives.s
===================================================================
--- test/MC/Mips/mips-data-directives.s
+++ test/MC/Mips/mips-data-directives.s
@@ -7,30 +7,35 @@
 
 # CHECK-ASM: .4byte 3735929054
 # CHECK-ASM: .8byte -2401050962867405073
+# CHECK-ASM: .2byte 49374
 # CHECK-ASM: .4byte label
 # CHECK-ASM: .8byte label
+# CHECK-ASM: .2byte label
 
 # Checking if the data and reloations were correctly emitted
 # CHECK-OBJ:  Section {
 # CHECK-OBJ:    Name: .data
 # CHECK-OBJ:    SectionData (
-# CHECK-OBJ:      0000: DEADC0DE DEADC0DE DEADBEEF 00000000
+# CHECK-OBJ:      0000: DEADC0DE DEADC0DE DEADBEEF C0DE0000
 # CHECK-OBJ:      0010: 00000000 00000000
 # CHECK-OBJ:    )
 # CHECK-OBJ:  }
 
 # CHECK-OBJ:  Section {
 # CHECK-OBJ:    Name: .rel.data
 # CHECK-OBJ:    Relocations [
-# CHECK-OBJ:      0xC R_MIPS_32 .data 0x0
-# CHECK-OBJ:      0x10 R_MIPS_64 .data 0x0
+# CHECK-OBJ:      0xE R_MIPS_32 .data 0x0
+# CHECK-OBJ:      0x12 R_MIPS_64 .data 0x0
+# CHECK-OBJ:      0x1A R_MIPS_16 .data 0x0
 # CHECK-OBJ:    ]
 # CHECK-OBJ:  }
 
 .data
 label:
         .word 0xdeadc0de
         .dword 0xdeadc0dedeadbeef
+        .hword 0xc0de
 
         .word label
         .dword label
+        .hword label
Index: lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
===================================================================
--- lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
+++ lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
@@ -412,6 +412,7 @@
   case ELF::R_MICROMIPS_LO16:
     return true;
 
+  case ELF::R_MIPS_16:
   case ELF::R_MIPS_32:
     if (cast<MCSymbolELF>(Sym).getOther() & ELF::STO_MIPS_MICROMIPS)
       return true;
Index: lib/Target/Mips/AsmParser/MipsAsmParser.cpp
===================================================================
--- lib/Target/Mips/AsmParser/MipsAsmParser.cpp
+++ lib/Target/Mips/AsmParser/MipsAsmParser.cpp
@@ -6216,6 +6216,11 @@
     return false;
   }
 
+  if (IDVal == ".hword") {
+    parseDataDirective(2, DirectiveID.getLoc());
+    return false;
+  }
+
   if (IDVal == ".option")
     return parseDirectiveOption();
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D17200.47799.patch
Type: text/x-patch
Size: 2140 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160212/c5754a98/attachment.bin>