3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-18 22:59:02 +00:00
Commit graph

961 commits

Author SHA1 Message Date
Nuno Lopes 6a0c409b0f move a few strings instead of copying 2019-02-28 10:53:27 +00:00
Nikolaj Bjorner e79f7ca1fd
Merge pull request #2150 from Nils-Becker/master
Logging Support for Theory Solvers
2019-02-27 17:06:31 +01:00
Nikolaj Bjorner 6ef3e5e363 integrate some self-contained fixes from #2147
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-24 14:21:34 -08:00
nilsbecker 960708e99e Merge branch 'master' of https://github.com/Z3Prover/z3 2019-02-23 12:34:40 +01:00
nilsbecker 6ee3941523 more cleanup 2019-02-23 12:08:08 +01:00
Nikolaj Bjorner c0d20f8ea8 add cr
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-23 10:59:10 +01:00
Nikolaj Bjorner 28c675f56e
Merge pull request #2146 from danielschemmel/buffer-1
Buffer and Vector Modernization Part 1
2019-02-23 10:55:08 +01:00
nilsbecker a8586746be cleanup for pull request 2019-02-23 02:47:33 +01:00
nilsbecker ec76efedbe synchronizing with main repository 2019-02-22 00:19:43 +01:00
Nuno Lopes bb7aa16223 stopwatch: fix debug build crash in sat solver 2019-02-21 16:38:48 +00:00
Nuno Lopes 6598aedbb2 fix VS build, take 2 2019-02-21 15:52:52 +00:00
Nuno Lopes 3d7878bafc hopefully fix build with VS 2012 2019-02-21 15:25:26 +00:00
Nuno Lopes 2f33bafd5a stopwatches: fix a few places that would call start/stop multiple times 2019-02-21 14:59:31 +00:00
Daniel Schemmel 721ea2a8d3
Move vector.h to old_vector.h and add a shim vector.h
To do so, one instance of the class keyword needs to be removed.
2019-02-21 15:38:08 +01:00
Nuno Lopes 85162d90d1 simplify timer.h 2019-02-21 13:57:38 +00:00
Nuno Lopes 3a7c467822 fix debug build.. 2019-02-21 13:33:52 +00:00
Nuno Lopes 3a5263be95 modernize stopwatch 2019-02-21 13:30:27 +00:00
Daniel Schemmel 2ff2e77739
Move buffer.h to old_buffer.h and add a shim buffer.h 2019-02-21 13:05:58 +01:00
Nuno Lopes a76c0fbbfb simplify timeout mechanism and fix race conditions there 2019-02-21 11:49:41 +00:00
Nuno Lopes f3cd7d646d further simplifications to scoped_timer 2019-02-21 10:42:42 +00:00
Nuno Lopes edf0df634d simplifications to refs 2019-02-19 13:18:20 +00:00
Nuno Lopes 73f6806371 rewrite scoped_timer in C++11 way
the code is much smaller and reused across platforms
I see a small speedup on linux as well
2019-02-04 17:42:27 +00:00
Nikolaj Bjorner 498864c582 adding dump facility for cancelation #2095, easing dimacs in/out
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-24 12:21:23 -08:00
Nikolaj Bjorner ee07008fb9 import files from csp
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-14 15:04:46 -08:00
Nikolaj Bjorner e954f59052 ensure that solver objects have timeout/rlimit/ctrl-c exposed as possible parameters
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-14 13:50:17 -08:00
Bruce Mitchener d757c342d5 Define NO_Z3_DEBUGGER for emscripten builds. 2019-01-07 23:13:09 +07:00
Nikolaj Bjorner 2486971094
Merge pull request #2065 from waywardmonkeys/improve-ios-support
Define NO_Z3_DEBUGGER for iOS builds.
2019-01-06 18:56:03 -08:00
Bruce Mitchener 7e1ce2a16c Define NO_Z3_DEBUGGER for iOS builds.
This is defined because we can't call `system` (via `invoke_gdb`)
on iOS and related platforms.
2019-01-06 12:16:33 +07:00
Bruce Mitchener a06bc49710 Let str_hashtable store const char*.
This removes some boilerplate const casting.
2019-01-06 12:15:31 +07:00
Bruce Mitchener 877df0f1cc If NO_Z3_DEBUGGER, also drop defining invoke_gdb. 2018-12-27 09:21:45 -05:00
nilsbecker 6d2cf4f464 smt-like logging of theory specific meaning of constants 2018-12-10 22:49:08 +01:00
Bruce Mitchener 51a947b73d Change how 64 bit builds are detected.
Instead of doing this at configure time, we look at the actual
compile time status. This also avoids hardcoding checks based on
what CPU architecture is present, which doesn't work when Z3 is
being built on non-x86_64 platforms.
2018-12-09 16:16:20 +07:00
Bruce Mitchener 4bc1b0b8c8 Fix typos. 2018-12-05 21:07:34 +07:00
Nikolaj Bjorner 030f458017 add vs2013 specific def for thread local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-12-03 09:15:30 -08:00
Nikolaj Bjorner 9849644f15
Merge pull request #2005 from waywardmonkeys/remove-macos-ifdef
Remove undef max/min on macOS.
2018-12-03 07:18:41 -08:00
Bruce Mitchener a0264c08a8 Windows builds need immintrin.h
Fixes issue #2006.
2018-12-03 22:15:14 +07:00
Bruce Mitchener 742efd5104 Remove undef max/min on macOS.
This is no longer needed.
2018-12-03 12:32:45 +07:00
Nikolaj Bjorner 8fc75f59b0
Merge pull request #2003 from waywardmonkeys/use-thread_local-storage-specifier
Use C++11 thread_local for portability.
2018-12-02 12:32:01 -05:00
Nikolaj Bjorner cadf4ff914
Merge pull request #2002 from waywardmonkeys/remove-thread-local-macro
Remove unused THREAD_LOCAL macro.
2018-12-02 12:31:43 -05:00
Nikolaj Bjorner 74bc461e6b
Merge pull request #1999 from waywardmonkeys/fix-typo
Fix typo.
2018-12-02 12:31:19 -05:00
Bruce Mitchener a332eb10bc Use C++11 thread_local for portability.
This should work on all supported compilers rather than using
__declspec(thread) and __thread.
2018-12-02 22:10:37 +07:00
Bruce Mitchener a0a940f938 Remove unused THREAD_LOCAL macro. 2018-12-02 13:58:31 +07:00
Bruce Mitchener 150fe881ce Fix typo. 2018-12-01 21:06:16 +07:00
Bruce Mitchener a3ece29628 Remove include of immintrin.h.
This file doesn't appear to be used and isn't available on all
platforms.
2018-12-01 20:39:03 +07:00
Nikolaj Bjorner f2de15a665
Merge pull request #1982 from waywardmonkeys/avoid-const-params-in-decls
Avoid const params in decls.
2018-11-28 09:08:03 -08:00
Bruce Mitchener 2016f48dc9 Avoid const params in decls.
Const-qualification of parameters only has an effect in function
definitions.
2018-11-28 19:07:33 +07:00
Bruce Mitchener b83d6d77c9 Use nullptr rather than 0/NULL. 2018-11-28 14:57:01 +07:00
Bruce Mitchener e570940662 Prefer using empty rather than size comparisons. 2018-11-27 21:42:04 +07:00
Nikolaj Bjorner 8e83d04e02 this->size()
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-25 14:22:22 -08:00
Nikolaj Bjorner 16be5b0e7d fix #1816 - m_parent_selects gets updated while accessing an interator, fix is to rely on the size of the vector for iteration
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-25 14:04:17 -08:00