Subzero: Fix new issues after the LLVM 3.5 merge.

tests_lit/assembler/x86/immediate_encodings.ll

 ; Tests various aspects of x86 immediate encoding. Some encodings are shorter.
 ; For example, the encoding is shorter for 8-bit immediates or when using EAX.
 ; This assumes that EAX is chosen as the first free register in O2 mode.
 
 ; RUN: %p2i -i %s --args -O2 --verbose none \
 ; RUN:   | llvm-mc -triple=i686-none-nacl -filetype=obj \
 ; RUN:   | llvm-objdump -d --symbolize -x86-asm-syntax=intel - | FileCheck %s
 
 define internal i32 @testXor8Imm8(i32 %arg) {
 entry:
@@ skipping 42 matching lines @@
 ; CHECK: 66 83 f0 7f  xor ax, 127
 
 define internal i32 @testXor16Imm8Neg(i32 %arg) {
 entry:
   %arg_i16 = trunc i32 %arg to i16
   %result_i16 = xor i16 %arg_i16, -128
   %result = zext i16 %result_i16 to i32
   ret i32 %result
 }
 ; CHECK-LABEL: testXor16Imm8Neg
-; CHECK: 66 83 f0 80  xor ax, 128
+; CHECK: 66 83 f0 80  xor ax, -128
 
 define internal i32 @testXor16Imm16Eax(i32 %arg) {
 entry:
   %arg_i16 = trunc i32 %arg to i16
   %tmp = xor i16 %arg_i16, 1024
   %result_i16 = add i16 %tmp, 1
   %result = zext i16 %result_i16 to i32
   ret i32 %result
 }
 ; CHECK-LABEL: testXor16Imm16Eax
@@ skipping 112 matching lines @@
 
 define internal i32 @testMul16Imm8Neg(i32 %arg) {
 entry:
   %arg_i16 = trunc i32 %arg to i16
   %tmp = mul i16 %arg_i16, -111
   %result_i16 = add i16 %tmp, 1
   %result = zext i16 %result_i16 to i32
   ret i32 %result
 }
 ; CHECK-LABEL: testMul16Imm8Neg
-; CHECK: 66 6b c0 91  imul ax, ax, 145
+; CHECK: 66 6b c0 91  imul ax, ax, -111
 ; CHECK-NEXT: add ax, 1
 
 define internal i32 @testMul16Imm16(i32 %arg) {
 entry:
   %arg_i16 = trunc i32 %arg to i16
   %tmp = mul i16 %arg_i16, 1024
   %result_i16 = add i16 %tmp, 1
   %result = zext i16 %result_i16 to i32
   ret i32 %result
 }
@@ skipping 94 matching lines @@
   %r4 = call i64 @llvm.ctlz.i64(i64 %w, i1 false)
   %res1 = add i64 %r, %r2
   %res2 = add i64 %r3, %r4
   %res = add i64 %res1, %res2
   ret i64 %res
 }
 ; CHECK-LABEL: test_via_ctlz_64
 ; CHECK-DAG: 85 c0 test eax, eax
 ; CHECK-DAG: 85 db test ebx, ebx
 ; CHECK-DAG: 85 f6 test esi, esi