Skip to content

Commit 01aaa6e

Browse files
committed
Merge branch 'release-1.7.2'
2 parents 435044d + 2f2d6a2 commit 01aaa6e

File tree

17 files changed

+469
-144
lines changed

17 files changed

+469
-144
lines changed

CONTRIBUTING.md

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
# Contribution Guidelines
1+
## Contribution Guidelines
2+
23

34
The information provided here is a must read for anyone who would like to
45
contribute to SMACK. Hence, please make sure to study thoroughly the following
56
items before you start contributing:
6-
7-
* We adhere to the [Open Code of Conduct](http://todogroup.org/opencodeofconduct/#SMACK/zvonimir@cs.utah.edu). By participating, you are expected to honor this code.
8-
* We use this [git branching model](http://nvie.com/posts/a-successful-git-branching-model/). Please avoid working directly on the `master` branch.
9-
* We follow guidelines for [good git commit practice](https://wiki.openstack.org/wiki/GitCommitMessages)
10-
* We follow the [LLVM Coding Standards](http://llvm.org/docs/CodingStandards.html)
7+
* We adhere to the [Contributor Covenant Code of Conduct](docs/code-of-conduct.md).
8+
By participating, you are expected to honor this code.
9+
* We use this [git branching
10+
model](http://nvie.com/posts/a-successful-git-branching-model/). Please avoid
11+
working directly on the `master` branch.
12+
* We follow guidelines for [good git commit
13+
practice](https://wiki.openstack.org/wiki/GitCommitMessages)
14+
* We follow the [LLVM Coding
15+
Standards](http://llvm.org/docs/CodingStandards.html)
1116

Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#---------------------------------------------------------------------------
66
DOXYFILE_ENCODING = UTF-8
77
PROJECT_NAME = smack
8-
PROJECT_NUMBER = 1.7.1
8+
PROJECT_NUMBER = 1.7.2
99
PROJECT_BRIEF = "A bounded software verifier."
1010
PROJECT_LOGO =
1111
OUTPUT_DIRECTORY = docs

LICENSE

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
The MIT License
22

3-
Copyright (c) 2008-2016 Zvonimir Rakamaric (zvonimir@cs.utah.edu),
3+
Copyright (c) 2008-2017 Zvonimir Rakamaric (zvonimir@cs.utah.edu),
44
Michael Emmi (michael.emmi@gmail.com)
5-
Modified work Copyright (c) 2013-2016 Pantazis Deligiannis,
6-
Montgomery Carter,
5+
Modified work Copyright (c) 2013-2017 Montgomery Carter,
6+
Pantazis Deligiannis,
7+
Dietrich Geisler,
78
Arvind Haran,
89
Shaobo He,
910
Jiten Thakkar,

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ SMACK.
5959
1. [Demos](docs/demos.md)
6060
1. [FAQ](docs/faq.md)
6161
1. [Inline Boogie Code](docs/boogie-code.md)
62-
1. [Contribution Guidelines](docs/contributions.md)
62+
1. [Contribution Guidelines](CONTRIBUTING.md)
6363
1. [Projects](docs/projects.md)
6464
1. [Publications](docs/publications.md)
6565
1. [People](docs/people.md)

bin/package-smack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Note: this script requires CDE to be downloaded from
77
# http://www.pgbovine.net/cde.html
88

9-
VERSION=1.7.1
9+
VERSION=1.7.2
1010
PACKAGE=smack-$VERSION-64
1111

1212
# Create folder to export

docs/contributions.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

docs/people.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
### Coordinators
55

66
* [Michael Emmi](http://michael-emmi.github.io)
7-
* [Zvonimir Rakamaric](http://www.zvonimir.info/) ([SOAR Lab](http://soarlab.org/), University of Utah)
7+
* [Zvonimir Rakamaric](http://www.zvonimir.info) ([SOAR Lab](http://soarlab.org), University of Utah)
88

99

1010
### Contributors
1111

12-
* [Montgomery Carter](http://www.linkedin.com/pub/montgomery-carter/12/a89/512) ([SOAR Lab](http://soarlab.org/), University of Utah)
13-
* [Pantazis Deligiannis](http://pdeligia.github.io/) (Microsoft Research)
14-
* [Arvind Haran](http://www.cs.utah.edu/~haran) ([SOAR Lab](http://soarlab.org/), University of Utah)
15-
* [Shaobo He](http://www.cs.utah.edu/~shaobo) ([SOAR Lab](http://soarlab.org/), University of Utah)
16-
* [Jiten Thakkar](http://jiten-thakkar.com) ([SOAR Lab](http://soarlab.org/), University of Utah)
12+
* [Montgomery Carter](http://www.linkedin.com/pub/montgomery-carter/12/a89/512) ([SOAR Lab](http://soarlab.org), University of Utah)
13+
* [Pantazis Deligiannis](http://pdeligia.github.io) (Microsoft Research)
14+
* [Dietrich Geisler](https://github.com/Checkmate50) ([SOAR Lab](http://soarlab.org), University of Utah)
15+
* [Arvind Haran](http://www.cs.utah.edu/~haran) ([SOAR Lab](http://soarlab.org), University of Utah)
16+
* [Shaobo He](http://www.cs.utah.edu/~shaobo) ([SOAR Lab](http://soarlab.org), University of Utah)
17+
* [Jiten Thakkar](http://jiten-thakkar.com) ([SOAR Lab](http://soarlab.org), University of Utah)
1718
* [Jonathan Whitaker](https://www.linkedin.com/in/jonathan-whitaker-5a8b2484) ([SOAR Lab](http://soarlab.org/), University of Utah)
1819

include/smack/Naming.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class Naming {
2828
static const std::string UNINTERPRETED_FLOAT_TYPE;
2929
static const std::string FLOAT_TYPE;
3030
static const std::string DOUBLE_TYPE;
31+
static const std::string LONG_DOUBLE_TYPE;
3132
static const std::string PTR_TYPE;
3233
static const std::string NULL_VAL;
3334

lib/smack/Naming.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const std::string Naming::BOOL_TYPE = "bool";
1515
const std::string Naming::UNINTERPRETED_FLOAT_TYPE = "float";
1616
const std::string Naming::FLOAT_TYPE = "bvfloat";
1717
const std::string Naming::DOUBLE_TYPE = "bvdouble";
18+
const std::string Naming::LONG_DOUBLE_TYPE = "bvlongdouble";
1819
const std::string Naming::PTR_TYPE = "ref";
1920
const std::string Naming::NULL_VAL = "$0.ref";
2021

lib/smack/SmackRep.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@ std::string SmackRep::type(const llvm::Type* t) {
201201
return Naming::FLOAT_TYPE;
202202
else if (t->isDoubleTy())
203203
return Naming::DOUBLE_TYPE;
204+
else if (t->isX86_FP80Ty())
205+
return Naming::LONG_DOUBLE_TYPE;
204206
else
205207
llvm_unreachable("Unsupported floating-point type.");
206208
}
@@ -950,6 +952,7 @@ std::string SmackRep::getPrelude() {
950952
if (SmackOptions::FloatEnabled) {
951953
s << Decl::typee(Naming::FLOAT_TYPE, "float24e8") << "\n";
952954
s << Decl::typee(Naming::DOUBLE_TYPE, "float53e11") << "\n";
955+
s << Decl::typee(Naming::LONG_DOUBLE_TYPE, "float65e15") << "\n";
953956
}
954957
s << Decl::typee(Naming::UNINTERPRETED_FLOAT_TYPE, intType(32)) << "\n";
955958
s << "\n";

0 commit comments

Comments
 (0)