diff options
| -rw-r--r-- | lib/Module/InstructionOperandTypeCheckPass.cpp | 2 | ||||
| -rw-r--r-- | runtime/Intrinsic/klee_choose.c (renamed from runtime/klee-libc/klee-choose.c) | 0 | ||||
| -rwxr-xr-x | scripts/IStatsMerge.py | 2 | ||||
| -rwxr-xr-x | scripts/IStatsSum.py | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/coverageServer.py | 2 | ||||
| -rwxr-xr-x | scripts/genTempFiles.sh | 2 | ||||
| -rwxr-xr-x | scripts/klee-control | 2 | ||||
| -rwxr-xr-x | scripts/objdump | 2 | ||||
| -rwxr-xr-x | test/Concrete/ConcreteTest.py | 2 | ||||
| -rw-r--r-- | test/Concrete/FloatingPointOps.ll | 12 | ||||
| -rw-r--r-- | test/Replay/libkleeruntest/replay_invalid_klee_choose.c | 2 |
11 files changed, 14 insertions, 16 deletions
diff --git a/lib/Module/InstructionOperandTypeCheckPass.cpp b/lib/Module/InstructionOperandTypeCheckPass.cpp index 8f2b59bd..1a1422ec 100644 --- a/lib/Module/InstructionOperandTypeCheckPass.cpp +++ b/lib/Module/InstructionOperandTypeCheckPass.cpp @@ -173,7 +173,7 @@ bool InstructionOperandTypeCheckPass::runOnModule(Module &M) { for (Function::iterator bi = fi->begin(), be = fi->end(); bi != be; ++bi) { for (BasicBlock::iterator ii = bi->begin(), ie = bi->end(); ii != ie; ++ii) { - Instruction *i = static_cast<Instruction *>(ii); + Instruction *i = &*ii; instructionOperandsConform &= checkInstruction(i); } } diff --git a/runtime/klee-libc/klee-choose.c b/runtime/Intrinsic/klee_choose.c index 44e5cea2..44e5cea2 100644 --- a/runtime/klee-libc/klee-choose.c +++ b/runtime/Intrinsic/klee_choose.c diff --git a/scripts/IStatsMerge.py b/scripts/IStatsMerge.py index ae87033f..9ba43981 100755 --- a/scripts/IStatsMerge.py +++ b/scripts/IStatsMerge.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # ===-- IStatsMerge.py ----------------------------------------------------===## # diff --git a/scripts/IStatsSum.py b/scripts/IStatsSum.py index 0546e895..78e694c1 100755 --- a/scripts/IStatsSum.py +++ b/scripts/IStatsSum.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # ===-- IStatsSum.py ------------------------------------------------------===## # diff --git a/scripts/coverageServer.py b/scripts/coverageServer.py index 841b8e5e..9be8c26d 100644..100755 --- a/scripts/coverageServer.py +++ b/scripts/coverageServer.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # ===-- coverageServer.py -------------------------------------------------===## # diff --git a/scripts/genTempFiles.sh b/scripts/genTempFiles.sh index fa6e435f..a3ffac4d 100755 --- a/scripts/genTempFiles.sh +++ b/scripts/genTempFiles.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # ===-- genTempFiles.sh ---------------------------------------------------===## # diff --git a/scripts/klee-control b/scripts/klee-control index 2f111524..0a918b42 100755 --- a/scripts/klee-control +++ b/scripts/klee-control @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # ===-- klee-control ------------------------------------------------------===## # diff --git a/scripts/objdump b/scripts/objdump index 3090d383..30f5893b 100755 --- a/scripts/objdump +++ b/scripts/objdump @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # ===-- objdump -----------------------------------------------------------===## # diff --git a/test/Concrete/ConcreteTest.py b/test/Concrete/ConcreteTest.py index 66d18c83..57ea77d2 100755 --- a/test/Concrete/ConcreteTest.py +++ b/test/Concrete/ConcreteTest.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python from __future__ import print_function import argparse diff --git a/test/Concrete/FloatingPointOps.ll b/test/Concrete/FloatingPointOps.ll index 5dd6d2fe..00d4e877 100644 --- a/test/Concrete/FloatingPointOps.ll +++ b/test/Concrete/FloatingPointOps.ll @@ -642,18 +642,16 @@ entry: %nan1 = load double* %nan %nan2 = load double* %nan - ; Warning: NaN comparisons with normal operators is BROKEN in LLVM JIT v2.0. Fixed in v2.1. - ; FIXME: Just check against 2.9 and the Unordered checks work, but the ordered ones do not. Should be investigated. ; NaNs do different things depending on ordered vs unordered -; call void @testFCmpBothOrdered( double %nan1, double 0.000000e+00, i1 0, i1 0, i1 0, i1 0, i1 0, i1 0, i1 0 ) -; call void @testFCmpBothOrdered( double %nan1, double %nan2, i1 0, i1 0, i1 0, i1 0, i1 0, i1 0, i1 0 ) -; call void @testFCmpBothUnordered( double %nan1, double 0.000000e+00, i1 1, i1 1, i1 1, i1 1, i1 1, i1 1, i1 1 ) -; call void @testFCmpBothUnordered( double %nan1, double %nan2, i1 1, i1 1, i1 1, i1 1, i1 1, i1 1, i1 1 ) + call void @testFCmpBothOrdered( double %nan1, double 0.000000e+00, i1 0, i1 0, i1 0, i1 0, i1 0, i1 0, i1 0 ) + call void @testFCmpBothOrdered( double %nan1, double %nan2, i1 0, i1 0, i1 0, i1 0, i1 0, i1 0, i1 0 ) + call void @testFCmpBothUnordered( double %nan1, double 0.000000e+00, i1 1, i1 1, i1 1, i1 1, i1 1, i1 1, i1 1 ) + call void @testFCmpBothUnordered( double %nan1, double %nan2, i1 1, i1 1, i1 1, i1 1, i1 1, i1 1, i1 1 ) ret void } -; tes all floating point instructions +; test all floating point instructions define i32 @main() { entry: call void @testFPTrunc( ) diff --git a/test/Replay/libkleeruntest/replay_invalid_klee_choose.c b/test/Replay/libkleeruntest/replay_invalid_klee_choose.c index 62cdcec3..c64f913d 100644 --- a/test/Replay/libkleeruntest/replay_invalid_klee_choose.c +++ b/test/Replay/libkleeruntest/replay_invalid_klee_choose.c @@ -1,6 +1,6 @@ // RUN: %llvmgcc -DBOUND_VALUE=32 -DFORCE_VALUE=20 %s -emit-llvm -g -O0 -c -o %t.bc // RUN: rm -rf %t.klee-out -// RUN: %klee --output-dir=%t.klee-out --libc=klee --search=dfs %t.bc +// RUN: %klee --output-dir=%t.klee-out --search=dfs %t.bc // RUN: test -f %t.klee-out/test000001.ktest // RUN: test ! -f %t.klee-out/test000002.ktest |