mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-20 12:53:38 +00:00
Code Activity

compiler love: make a few symbols static and avoid unneeded relocations

Browse source 
Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
This commit is contained in:
Nuno Lopes 2015-02-22 11:13:51 +00:00
parent a96a9a076d
commit 5676fbbc9e
7 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/mk_util.py
View file

@ -2104,7 +2104,7 @@ def mk_pat_db():
c = get_component(PATTERN_COMPONENT) c = get_component(PATTERN_COMPONENT)
fin = open(os.path.join(c.src_dir, 'database.smt2'), 'r') fin = open(os.path.join(c.src_dir, 'database.smt2'), 'r')
fout = open(os.path.join(c.src_dir, 'database.h'), 'w') fout = open(os.path.join(c.src_dir, 'database.h'), 'w')
fout.write('char const * g_pattern_database =\n') fout.write('static char const g_pattern_database[] =\n')
for line in fin: for line in fin:
fout.write('"%s\\n"\n' % line.strip('\n')) fout.write('"%s\\n"\n' % line.strip('\n'))
fout.write(';\n') fout.write(';\n')

8
src/ast/ast_smt_pp.cpp
View file

@ -34,9 +34,9 @@ Revision History:
// --------------------------------------- // ---------------------------------------
// smt_renaming // smt_renaming
const static char* m_predef_names[] = { static const char m_predef_names[][8] = {
"=", ">=", "<=", "+", "-", "*", ">", "<", "!=", "or", "and", "implies", "not", "iff", "xor", "=", ">=", "<=", "+", "-", "*", ">", "<", "!=", "or", "and", "implies", "not", "iff", "xor",
"true", "false", "forall", "exists", "let", "flet", NULL "true", "false", "forall", "exists", "let", "flet"
}; };
symbol smt_renaming::fix_symbol(symbol s, int k) { symbol smt_renaming::fix_symbol(symbol s, int k) {
@ -120,8 +120,8 @@ bool smt_renaming::all_is_legal(char const* s) {
} }
smt_renaming::smt_renaming() { smt_renaming::smt_renaming() {
for (const char **p = m_predef_names; *p; ++p) { for (unsigned i = 0; i < ARRAYSIZE(m_predef_names); ++i) {
symbol s(*p); symbol s(m_predef_names[i]);
m_translate.insert(s, s); m_translate.insert(s, s);
m_rev_translate.insert(s, s); m_rev_translate.insert(s, s);
} }

2
src/ast/rewriter/poly_rewriter.h
View file

@ -26,8 +26,6 @@ Notes:
template<typename Config> template<typename Config>
class poly_rewriter : public Config { class poly_rewriter : public Config {
public:
static char const * g_ste_blowup_msg;
protected: protected:
typedef typename Config::numeral numeral; typedef typename Config::numeral numeral;
sort * m_curr_sort; sort * m_curr_sort;

5
src/ast/rewriter/poly_rewriter_def.h
View file

@ -22,9 +22,6 @@ Notes:
#include"ast_ll_pp.h" #include"ast_ll_pp.h"
#include"ast_smt2_pp.h" #include"ast_smt2_pp.h"
template<typename Config>
char const * poly_rewriter<Config>::g_ste_blowup_msg = "sum of monomials blowup";
template<typename Config> template<typename Config>
void poly_rewriter<Config>::updt_params(params_ref const & _p) { void poly_rewriter<Config>::updt_params(params_ref const & _p) {
@ -356,7 +353,7 @@ br_status poly_rewriter<Config>::mk_nflat_mul_core(unsigned num_args, expr * con
TRACE("som", for (unsigned i = 0; i < it.size(); i++) tout << it[i] << " "; TRACE("som", for (unsigned i = 0; i < it.size(); i++) tout << it[i] << " ";
tout << "\n";); tout << "\n";);
if (sum.size() > m_som_blowup) if (sum.size() > m_som_blowup)
throw rewriter_exception(g_ste_blowup_msg); throw rewriter_exception("sum of monomials blowup");
m_args.reset(); m_args.reset();
for (unsigned i = 0; i < num_args; i++) { for (unsigned i = 0; i < num_args; i++) {
expr * const * v = sums[i]; expr * const * v = sums[i];

2
src/smt/database.h
View file

@ -1,4 +1,4 @@
static char const * g_pattern_database = static char const g_pattern_database[] =
"(benchmark patterns \n" "(benchmark patterns \n"
" :status unknown \n" " :status unknown \n"
" :logic ALL \n" " :logic ALL \n"

2
src/util/memory_manager.cpp
View file

@ -60,7 +60,7 @@ static void throw_out_of_memory() {
} }
#ifdef PROFILE_MEMORY #ifdef PROFILE_MEMORY
unsigned g_synch_counter = 0; static unsigned g_synch_counter = 0;
class mem_usage_report { class mem_usage_report {
public: public:
~mem_usage_report() { ~mem_usage_report() {

4
src/util/util.cpp
View file

@ -19,7 +19,7 @@ Revision History:
#include"util.h" #include"util.h"
unsigned g_verbosity_level = 0; static unsigned g_verbosity_level = 0;
void set_verbosity_level(unsigned lvl) { void set_verbosity_level(unsigned lvl) {
g_verbosity_level = lvl; g_verbosity_level = lvl;
@ -40,7 +40,7 @@ std::ostream& verbose_stream() {
} }
void (*g_fatal_error_handler)(int) = 0; static void (*g_fatal_error_handler)(int) = 0;
void fatal_error(int error_code) { void fatal_error(int error_code) {
if (g_fatal_error_handler) { if (g_fatal_error_handler) {