Add remaining instructions to whitelist

test/NaCl/PNaClABI/instructions.ll

Index: test/NaCl/PNaClABI/instructions.ll
diff --git a/test/NaCl/PNaClABI/instructions.ll b/test/NaCl/PNaClABI/instructions.ll
index 2a8ccbdaca36016ecaaadf71899267a348113094..baef1d6c60dd69e076e96860f3951d7d164e578f 100644
--- a/test/NaCl/PNaClABI/instructions.ll
+++ b/test/NaCl/PNaClABI/instructions.ll
@@ -1,13 +1,14 @@
 ; RUN: opt -verify-pnaclabi-functions -analyze < %s |& FileCheck %s
 ; Test instruction opcodes allowed by PNaCl ABI
+; No testing yet of operands, types, attributes, etc
 
 target datalayout = "e-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-p:32:32:32-v128:32:32"
 target triple = "le32-unknown-nacl"
 
-define i32 @terminators() nounwind {
+define void @terminators() {
 ; Terminator instructions
 terminators:
- ret i32 0
+ ret void
  br i1 0, label %next2, label %next
 next:
  switch i32 1, label %next2 [i32 0, label %next]
@@ -17,4 +18,90 @@ next2:
   indirectbr i8* undef, [label %next, label %next2]
 ; CHECK-NOT: disallowed
 ; CHECK: Function terminators has disallowed instruction: indirectbr
+}
+
+define void @binops() {
+; Binary operations
+  %a1 = add i32 0, 0
+  %a2 = sub i32 0, 0
+  %a3 = fsub float 0.0, 0.0
+  %a4 = mul i32 0, 0
+  %a5 = fmul float 0.0, 0.0
+  %a6 = udiv i32 0, 1
+  %a7 = sdiv i32 0, 1
+  %a8 = fdiv float 0.0, 1.0
+  %a9 = urem i32 0, 1
+  %a10 = srem i32 0, 1
+  %a11 = frem float 0.0, 1.0
+; Bitwise binary operations
+  %a12 = shl i32 1, 1
+  %a13 = lshr i32 1, 1
+  %a14 = ashr i32 1, 1
+  %a15 = and i32 1, 1
+  %a16 = or i32 1, 1
+  %a17 = xor i32 1, 1
+  ret void
+}
+
+define void @vectors() {
+; CHECK-NOT: disallowed
+  %a1 = extractelement <2 x i32> <i32 0, i32 0>, i32 0
+; CHECK: Function vectors has disallowed instruction: extractelement
+  %a2 = shufflevector <2 x i32> undef , <2 x i32> undef, <2 x i32> undef
+; CHECK: Function vectors has disallowed instruction: shufflevector
+  %a3 = insertelement <2 x i32> undef, i32 1, i32 0
+; CHECK: Function vectors has disallowed instruction: insertelement
+  ret void

[jvoung (off chromium), 2013/01/23 00:42:07]

CHECK-NOT: disallowed after this too?

[Derek Schuff, 2013/01/23 01:00:42]

Done.

+}
+
+define void @aggregates() {
+; Aggregate operations
+  %a1 = extractvalue { i32, i32 } { i32 0, i32 0 }, 0
+  %a2 = insertvalue {i32, float} undef, i32 1, 0
+  ret void
+}
+
+define void @memory() {
+; Memory operations
+  %a1 = alloca i32
+  %a2 = load i32* undef
+  store i32 undef, i32* undef
+  fence acq_rel
+  %a3 = cmpxchg i32* undef, i32 undef, i32 undef acq_rel
+  %a4 = atomicrmw add i32* undef, i32 1 acquire
+  %a5 = getelementptr { i32, i32}* undef

[jvoung (off chromium), 2013/01/23 00:42:07]

will we support modifiers like "inbounds" -- seems related to supporting "nsw"
or not in the arithmetic instructions?

[Derek Schuff, 2013/01/23 01:00:42]

Yeah, I haven't added the modifiers yet.
On 2013/01/23 00:42:07, jvoung (cr) wrote:

+  ret void
+}
+
+define void @conversion() {
+; Conversion operations
+  %a1 = trunc i32 undef to i8
+  %a2 = zext i8 undef to i32
+  %a3 = sext i8 undef to i32
+  %a4 = fptrunc double undef to float
+  %a5 = fpext float undef to double
+  %a6 = fptoui double undef to i64
+  %a7 = fptosi double undef to i64
+  %a8 = uitofp i64 undef to double
+  %a9 = sitofp i64 undef to double
+  %a10 = ptrtoint i8* undef to i32
+  %a11 = inttoptr i32 undef to i8*
+  %a12 = bitcast i8* undef to i32*
+  ret void
+}
+
+define void @other() {
+entry:
+  %a1 = icmp eq i32 undef, undef
+  %a2 = fcmp eq float undef, undef
+  br i1 undef, label %foo, label %bar
+foo:
+; phi predecessor labels have to match to appease module verifier
+  %a3 = phi i32 [0, %entry], [0, %foo]
+  %a4 = select i1 true, i8 undef, i8 undef
+  %a5 = va_arg i8** undef, i32
+  call void @conversion()
+  br i1 undef, label %foo, label %bar
+bar:
+  ret void
 }