[llvm] r260896 - [mips] Implemented the .hword directive.

[Scott Egerton via llvm-commits]

Author: s.egerton
Date: Mon Feb 15 10:11:51 2016
New Revision: 260896

URL: http://llvm.org/viewvc/llvm-project?rev=260896&view=rev
Log:
[mips] Implemented the .hword directive.

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

Reviewers: vkalintiris, dsanders

Subscribers: dsanders, llvm-commits

Differential Revision: http://reviews.llvm.org/D17200

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

Modified: llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp?rev=260896&r1=260895&r2=260896&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp (original)
+++ llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp Mon Feb 15 10:11:51 2016
@@ -6216,6 +6216,11 @@ bool MipsAsmParser::ParseDirective(AsmTo
     return false;
   }
 
+  if (IDVal == ".hword") {
+    parseDataDirective(2, DirectiveID.getLoc());
+    return false;
+  }
+
   if (IDVal == ".option")
     return parseDirectiveOption();
 

Modified: llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp?rev=260896&r1=260895&r2=260896&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp Mon Feb 15 10:11:51 2016
@@ -412,6 +412,7 @@ bool MipsELFObjectWriter::needsRelocateW
   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;

Modified: llvm/trunk/test/MC/Mips/mips-data-directives.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Mips/mips-data-directives.s?rev=260896&r1=260895&r2=260896&view=diff
==============================================================================
--- llvm/trunk/test/MC/Mips/mips-data-directives.s (original)
+++ llvm/trunk/test/MC/Mips/mips-data-directives.s Mon Feb 15 10:11:51 2016
@@ -7,14 +7,16 @@
 
 # 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:  }
@@ -22,8 +24,9 @@
 # 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:  }
 
@@ -31,6 +34,8 @@
 label:
         .word 0xdeadc0de
         .dword 0xdeadc0dedeadbeef
+        .hword 0xc0de
 
         .word label
         .dword label
+        .hword label