Commit e859e5ac authored by Benoit Perrot's avatar Benoit Perrot
Browse files

Index: ChangeLog

from  Benoît Perrot  <benoit@lrde.epita.fr>

        Use STL type naming style.

        * dev/inst-nodes-gen.py,
        * src/inst/section.hh,
        * src/inst/data_section.hh,
        * src/inst/text_section.hh,
        * src/inst/exp.hh, src/inst/exp-visitor.hh
        * src/inst/label.hh, src/inst/label.cc,
        * src/task/task.hh,
        * src/task/task_register.cc,
        * src/vm/cpu.hh, src/vm/cpu.cc,
        * src/vm/table.hh,
        * src/misc/select_const.hh (label_list_t, kind_t, string_set_t)
        (offset_label_t, label_offset_t, deps_t, register_t, uregister_t) 
        (scope_t, scope_t, t):
        Rename as...
        (label_list_type, kind_type, string_set_type, offset_label_type)
        (label_offset_type, deps_type, register_type, uregister_type)
        (scope_type, scopes_type, type):
        these.
parent 10883ed9
2004-02-23 Benot Perrot <benoit@lrde.epita.fr>
Use STL type naming style.
* dev/inst-nodes-gen.py,
* src/inst/section.hh,
* src/inst/data_section.hh,
* src/inst/text_section.hh,
* src/inst/exp.hh, src/inst/exp-visitor.hh
* src/inst/label.hh, src/inst/label.cc,
* src/task/task.hh,
* src/task/task_register.cc,
* src/vm/cpu.hh, src/vm/cpu.cc,
* src/vm/table.hh,
* src/misc/select_const.hh (label_list_t, kind_t, string_set_t)
(offset_label_t, label_offset_t, deps_t, register_t, uregister_t)
(scope_t, scope_t, t):
Rename as...
(label_list_type, kind_type, string_set_type, offset_label_type)
(label_offset_type, deps_type, register_type, uregister_type)
(scope_type, scopes_type, type):
these.
2004-01-15 Benot Perrot <benoit@lrde.epita.fr>
* dev/doc-inst-set-gen.py,
......
......@@ -277,7 +277,7 @@ namespace inst
for inst in instructions:
if inst.level == "native":
print " virtual void\tvisit(typename select_const<K, " \
+ mipsy.class_id(inst.opcode) + ">::t&) = 0;"
+ mipsy.class_id(inst.opcode) + ">::type&) = 0;"
print """
};
......
......@@ -2,60 +2,62 @@
(Created-By-Prcs-Version 1 3 2)
(Project-Description "")
(Project-Version mipsy 0 71)
(Parent-Version mipsy 0 70)
(Project-Version mipsy 0 72)
(Parent-Version mipsy 0 71)
(Version-Log
"Index: ChangeLog
--- ChangeLog Thu, 15 Jan 2004 17:46:59 +0100 noe (mipsy/2_ChangeLog 1.64 604)
+++ ChangeLog Thu, 15 Jan 2004 20:46:42 +0100 noe (mipsy/2_ChangeLog 1.64 604)
@@ -1,5 +1,17 @@
2004-01-15 Benot Perrot <benoit@lrde.epita.fr>
+ * dev/doc-inst-set-gen.py,
+ * dev/inst-builder-gen.py,
+ * dev/inst-makefile-gen.py,
+ * dev/inst-nodes-gen.py,
+ * dev/parse-asm-parse-gen.py,
+ * dev/parse-asm-scan-gen.py,
+ * src/parse/Makefile.am,
+ * bootstrap:
+ Use lazy overwrite to limit file building.
+
+2004-01-15 Benot Perrot <benoit@lrde.epita.fr>
+
* dev/mipsy.xml: Describe each instruction.
* dev/doc-inst-set-gen.py: New file.
* Makefile.am: Distribute it.
from Benot Perrot <benoit@lrde.epita.fr>
Use STL type naming style.
* dev/inst-nodes-gen.py,
* src/inst/section.hh,
* src/inst/data_section.hh,
* src/inst/text_section.hh,
* src/inst/exp.hh, src/inst/exp-visitor.hh
* src/inst/label.hh, src/inst/label.cc,
* src/task/task.hh,
* src/task/task_register.cc,
* src/vm/cpu.hh, src/vm/cpu.cc,
* src/vm/table.hh,
* src/misc/select_const.hh (label_list_t, kind_t, string_set_t)
(offset_label_t, label_offset_t, deps_t, register_t, uregister_t)
(scope_t, scope_t, t):
Rename as...
(label_list_type, kind_type, string_set_type, offset_label_type)
(label_offset_type, deps_type, register_type, uregister_type)
(scope_type, scopes_type, type):
these.
")
(New-Version-Log
"")
(Checkin-Time "Fri, 16 Jan 2004 13:53:12 +0100")
(Checkin-Login noe)
(Checkin-Time "Mon, 23 Feb 2004 22:41:53 +0100")
(Checkin-Login benoit)
(Files
;; ./
(AUTHORS (mipsy/0_AUTHORS 1.1 604))
(COPYING (mipsy/1_COPYING 1.1 604))
(ChangeLog (mipsy/2_ChangeLog 1.65 604))
(AUTHORS (mipsy/0_AUTHORS 1.1 644))
(COPYING (mipsy/1_COPYING 1.1 644))
(ChangeLog (mipsy/2_ChangeLog 1.66 604))
(Makefile.am (mipsy/3_Makefile.a 1.8 604))
(NEWS (mipsy/b/25_NEWS 1.6 604))
(README (mipsy/4_README 1.2 604))
(TODO (mipsy/5_TODO 1.2 604))
(README (mipsy/4_README 1.2 644))
(TODO (mipsy/5_TODO 1.2 644))
(bootstrap (mipsy/b/14_bootstrap 1.3 705))
(configure.ac (mipsy/6_configure. 1.7 604))
(prj (mipsy.prj) :symlink)
;; ./config/
(config/Makefile.am (mipsy/7_Makefile.a 1.1 604))
(config/Makefile.am (mipsy/7_Makefile.a 1.1 644))
;; ./dev/
(dev/doc-inst-set-gen.py (mipsy/c/21_doc-inst-s 1.2 705))
(dev/inst-builder-gen.py (mipsy/15_mipsy-buil 1.9 705))
(dev/inst-makefile-gen.py (mipsy/b/15_mipsy-mk-i 1.6 705))
(dev/inst-nodes-gen.py (mipsy/12_mipsy-inst 1.6 705))
(dev/inst-nodes-gen.py (mipsy/12_mipsy-inst 1.7 705))
(dev/mipsy.py (mipsy/16_mipsy.py 1.7 705))
(dev/mipsy.xml (mipsy/17_mipsy.xml 1.14 604))
(dev/parse-asm-parse-gen.py (mipsy/13_mipsy-pars 1.8 705))
......@@ -72,120 +74,120 @@
(doc/mipsy.texi (mipsy/b/10_mipsy.texi 1.4 604))
;; ./src/
(src/Makefile.am (mipsy/18_Makefile.a 1.2 604))
(src/common.hh (mipsy/19_common.hh 1.3 604))
(src/mipsy-tasks.cc (mipsy/20_mipsy-task 1.2 604))
(src/mipsy-tasks.hh (mipsy/21_mipsy-task 1.2 604))
(src/Makefile.am (mipsy/18_Makefile.a 1.2 644))
(src/common.hh (mipsy/19_common.hh 1.3 644))
(src/mipsy-tasks.cc (mipsy/20_mipsy-task 1.2 644))
(src/mipsy-tasks.hh (mipsy/21_mipsy-task 1.2 644))
(src/mipsy.cc (mipsy/22_mipsy.cc 1.3 604))
(src/modules.hh (mipsy/23_modules.hh 1.2 604))
(src/modules.hh (mipsy/23_modules.hh 1.2 644))
;; ./src/inst/
(src/inst/data_section.hh (mipsy/24_data_secti 1.3 604))
(src/inst/exp-visitor.hh (mipsy/25_exp-visito 1.2 604))
(src/inst/exp.hh (mipsy/26_exp.hh 1.2 604))
(src/inst/inst-tasks.cc (mipsy/b/23_inst-tasks 1.1 604))
(src/inst/inst-tasks.hh (mipsy/b/22_inst-tasks 1.1 604))
(src/inst/inst.hh (mipsy/27_inst.hh 1.2 604))
(src/inst/label.cc (mipsy/b/21_label.cc 1.1 604))
(src/inst/label.hh (mipsy/b/20_label.hh 1.1 604))
(src/inst/program.hh (mipsy/28_program.hh 1.2 604))
(src/inst/data_section.hh (mipsy/24_data_secti 1.4 604))
(src/inst/exp-visitor.hh (mipsy/25_exp-visito 1.3 604))
(src/inst/exp.hh (mipsy/26_exp.hh 1.3 604))
(src/inst/inst-tasks.cc (mipsy/b/23_inst-tasks 1.1 644))
(src/inst/inst-tasks.hh (mipsy/b/22_inst-tasks 1.1 644))
(src/inst/inst.hh (mipsy/27_inst.hh 1.2 644))
(src/inst/label.cc (mipsy/b/21_label.cc 1.2 604))
(src/inst/label.hh (mipsy/b/20_label.hh 1.2 604))
(src/inst/program.hh (mipsy/28_program.hh 1.2 644))
(src/inst/program_builder.cc (mipsy/29_program_bu 1.11 604))
(src/inst/program_solver.hh (mipsy/30_program_so 1.6 604))
(src/inst/register.hh (mipsy/31_register.h 1.4 604))
(src/inst/section.hh (mipsy/b/24_section.hh 1.4 604))
(src/inst/text_section.hh (mipsy/32_text_secti 1.3 604))
(src/inst/program_solver.hh (mipsy/30_program_so 1.6 644))
(src/inst/register.hh (mipsy/31_register.h 1.4 644))
(src/inst/section.hh (mipsy/b/24_section.hh 1.5 604))
(src/inst/text_section.hh (mipsy/32_text_secti 1.4 604))
;; ./src/misc/
(src/misc/Makefile.am (mipsy/33_Makefile.a 1.2 604))
(src/misc/contract.hh (mipsy/34_contract.h 1.1 604))
(src/misc/deref.hh (mipsy/35_deref.hh 1.1 604))
(src/misc/escape.hh (mipsy/36_escape.hh 1.1 604))
(src/misc/has.hh (mipsy/37_has.hh 1.1 604))
(src/misc/select_const.hh (mipsy/38_select_con 1.1 604))
(src/misc/Makefile.am (mipsy/33_Makefile.a 1.2 644))
(src/misc/contract.hh (mipsy/34_contract.h 1.1 644))
(src/misc/deref.hh (mipsy/35_deref.hh 1.1 644))
(src/misc/escape.hh (mipsy/36_escape.hh 1.1 644))
(src/misc/has.hh (mipsy/37_has.hh 1.1 644))
(src/misc/select_const.hh (mipsy/38_select_con 1.2 604))
;; ./src/parse/
(src/parse/Makefile.am (mipsy/39_Makefile.a 1.4 604))
(src/parse/asm-scan.hh (mipsy/40_asm-scan.h 1.2 604))
(src/parse/libparse.cc (mipsy/41_libparse.c 1.4 604))
(src/parse/libparse.hh (mipsy/42_libparse.h 1.4 604))
(src/parse/parse-tasks.cc (mipsy/43_parse-task 1.6 604))
(src/parse/parse-tasks.hh (mipsy/44_parse-task 1.4 604))
(src/parse/asm-scan.hh (mipsy/40_asm-scan.h 1.2 644))
(src/parse/libparse.cc (mipsy/41_libparse.c 1.4 644))
(src/parse/libparse.hh (mipsy/42_libparse.h 1.4 644))
(src/parse/parse-tasks.cc (mipsy/43_parse-task 1.6 644))
(src/parse/parse-tasks.hh (mipsy/44_parse-task 1.4 644))
;; ./src/task/
(src/task/Makefile.am (mipsy/45_Makefile.a 1.2 604))
(src/task/task-tasks.cc (mipsy/46_task-tasks 1.2 604))
(src/task/task-tasks.hh (mipsy/47_task-tasks 1.2 604))
(src/task/task.cc (mipsy/48_task.cc 1.2 604))
(src/task/task.hh (mipsy/49_task.hh 1.3 604))
(src/task/task_register.cc (mipsy/50_task_regis 1.5 604))
(src/task/Makefile.am (mipsy/45_Makefile.a 1.2 644))
(src/task/task-tasks.cc (mipsy/46_task-tasks 1.2 644))
(src/task/task-tasks.hh (mipsy/47_task-tasks 1.2 644))
(src/task/task.cc (mipsy/48_task.cc 1.2 644))
(src/task/task.hh (mipsy/49_task.hh 1.4 604))
(src/task/task_register.cc (mipsy/50_task_regis 1.6 604))
(src/task/task_register.hh (mipsy/51_task_regis 1.3 604))
;; ./src/vm/
(src/vm/Makefile.am (mipsy/b/0_Makefile.a 1.4 604))
(src/vm/cpu.hh (mipsy/b/1_cpu.hh 1.12 604))
(src/vm/cpu.cc (mipsy/b/5_virtual_ma 1.19 604))
(src/vm/cpu.hh (mipsy/b/1_cpu.hh 1.13 604))
(src/vm/cpu.cc (mipsy/b/5_virtual_ma 1.20 604))
(src/vm/memory.hh (mipsy/b/2_memory.hh 1.8 604))
(src/vm/mmu.hh (mipsy/c/15_mmu.hh 1.2 604))
(src/vm/segment.hh (mipsy/b/3_segment.hh 1.2 604))
(src/vm/table.hh (mipsy/b/4_table.hh 1.2 604))
(src/vm/segment.hh (mipsy/b/3_segment.hh 1.2 644))
(src/vm/table.hh (mipsy/b/4_table.hh 1.3 604))
(src/vm/virtual_machine.hh (mipsy/b/6_virtual_ma 1.14 604))
(src/vm/vm-tasks.cc (mipsy/b/7_vm-tasks.c 1.5 604))
(src/vm/vm-tasks.hh (mipsy/b/8_vm-tasks.h 1.3 604))
;; ./tests/
(tests/Makefile.am (mipsy/b/26_Makefile.a 1.1 604))
(tests/common.mk (mipsy/b/27_common.mk 1.1 604))
(tests/generate-ref.mk (mipsy/b/28_generate-r 1.1 604))
(tests/mipsy-check (mipsy/b/29_mipsy-chec 1.1 705))
(tests/Makefile.am (mipsy/b/26_Makefile.a 1.1 644))
(tests/common.mk (mipsy/b/27_common.mk 1.1 644))
(tests/generate-ref.mk (mipsy/b/28_generate-r 1.1 644))
(tests/mipsy-check (mipsy/b/29_mipsy-chec 1.1 745))
;; ./tests/good/
(tests/good/Makefile.am (mipsy/b/30_Makefile.a 1.2 604))
(tests/good/add-sub.s (mipsy/b/31_add-sub.s 1.2 604))
(tests/good/and-or-nor-xor.s (mipsy/b/32_and-or-nor 1.2 604))
(tests/good/add-sub.s (mipsy/b/31_add-sub.s 1.2 644))
(tests/good/and-or-nor-xor.s (mipsy/b/32_and-or-nor 1.2 644))
(tests/good/check-good (mipsy/c/9_check-good 1.2 705))
(tests/good/exit.s (mipsy/b/33_exit.s 1.2 604))
(tests/good/extended-euclide.s (mipsy/b/34_extended-e 1.2 604))
(tests/good/gtcd.s (mipsy/b/35_gtcd.s 1.2 604))
(tests/good/modular-exponent.s (mipsy/b/36_modular-ex 1.2 604))
(tests/good/neg.s (mipsy/b/37_neg.s 1.2 604))
(tests/good/not.s (mipsy/b/38_not.s 1.2 604))
(tests/good/print.s (mipsy/b/39_print.s 1.2 604))
(tests/good/print_int.s (mipsy/b/40_print_int. 1.2 604))
(tests/good/read_int.in (mipsy/b/41_read_int.i 1.1 604))
(tests/good/read_int.s (mipsy/b/42_read_int.s 1.2 604))
(tests/good/seq-sne.s (mipsy/b/43_seq-sne.s 1.2 604))
(tests/good/shift.s (mipsy/b/44_shift.s 1.2 604))
(tests/good/exit.s (mipsy/b/33_exit.s 1.2 644))
(tests/good/extended-euclide.s (mipsy/b/34_extended-e 1.2 644))
(tests/good/gtcd.s (mipsy/b/35_gtcd.s 1.2 644))
(tests/good/modular-exponent.s (mipsy/b/36_modular-ex 1.2 644))
(tests/good/neg.s (mipsy/b/37_neg.s 1.2 644))
(tests/good/not.s (mipsy/b/38_not.s 1.2 644))
(tests/good/print.s (mipsy/b/39_print.s 1.2 644))
(tests/good/print_int.s (mipsy/b/40_print_int. 1.2 644))
(tests/good/read_int.in (mipsy/b/41_read_int.i 1.1 644))
(tests/good/read_int.s (mipsy/b/42_read_int.s 1.2 644))
(tests/good/seq-sne.s (mipsy/b/43_seq-sne.s 1.2 644))
(tests/good/shift.s (mipsy/b/44_shift.s 1.2 644))
;; ./tests/lexical/
(tests/lexical/Makefile.am (mipsy/b/45_Makefile.a 1.1 604))
(tests/lexical/check-lexical (mipsy/c/10_check-lexi 1.1 705))
(tests/lexical/invalid-string-hexa.s (mipsy/b/46_invalid-st 1.1 604))
(tests/lexical/invalid-string-octal.s (mipsy/b/47_invalid-st 1.1 604))
(tests/lexical/unlimited-regs.s (mipsy/b/48_unlimited- 1.1 604))
(tests/lexical/unrecognized-escape.s (mipsy/b/49_unrecogniz 1.1 604))
(tests/lexical/unterminated-string.s (mipsy/b/50_unterminat 1.1 604))
(tests/lexical/Makefile.am (mipsy/b/45_Makefile.a 1.1 644))
(tests/lexical/check-lexical (mipsy/c/10_check-lexi 1.1 745))
(tests/lexical/invalid-string-hexa.s (mipsy/b/46_invalid-st 1.1 644))
(tests/lexical/invalid-string-octal.s (mipsy/b/47_invalid-st 1.1 644))
(tests/lexical/unlimited-regs.s (mipsy/b/48_unlimited- 1.1 644))
(tests/lexical/unrecognized-escape.s (mipsy/b/49_unrecogniz 1.1 644))
(tests/lexical/unterminated-string.s (mipsy/b/50_unterminat 1.1 644))
;; ./tests/runtime/
(tests/runtime/Makefile.am (mipsy/b/51_Makefile.a 1.1 604))
(tests/runtime/Makefile.am (mipsy/b/51_Makefile.a 1.1 644))
(tests/runtime/check-runtime (mipsy/c/11_check-runt 1.2 705))
(tests/runtime/neg.s (mipsy/c/0_neg.s 1.2 604))
(tests/runtime/no-main.s (mipsy/c/1_no-main.s 1.2 604))
(tests/runtime/neg.s (mipsy/c/0_neg.s 1.2 644))
(tests/runtime/no-main.s (mipsy/c/1_no-main.s 1.2 644))
;; ./tests/solve/
(tests/solve/Makefile.am (mipsy/c/2_Makefile.a 1.1 604))
(tests/solve/check-solve (mipsy/c/12_check-solv 1.1 705))
(tests/solve/undefined-labels.s (mipsy/c/3_undefined- 1.2 604))
(tests/solve/Makefile.am (mipsy/c/2_Makefile.a 1.1 644))
(tests/solve/check-solve (mipsy/c/12_check-solv 1.1 745))
(tests/solve/undefined-labels.s (mipsy/c/3_undefined- 1.2 644))
;; ./tests/syntax/
(tests/syntax/Makefile.am (mipsy/c/4_Makefile.a 1.1 604))
(tests/syntax/Makefile.am (mipsy/c/4_Makefile.a 1.1 644))
(tests/syntax/asciiz-wrong-param.s (mipsy/c/5_asciiz-wro 1.2 604))
(tests/syntax/check-syntax (mipsy/c/13_check-synt 1.1 705))
(tests/syntax/too-many-operands.s (mipsy/c/6_too-many-o 1.2 604))
(tests/syntax/check-syntax (mipsy/c/13_check-synt 1.1 745))
(tests/syntax/too-many-operands.s (mipsy/c/6_too-many-o 1.2 644))
;; ./tests/unlimited/
(tests/unlimited/Makefile.am (mipsy/c/7_Makefile.a 1.2 604))
(tests/unlimited/check-unlimited (mipsy/c/14_check-unli 1.2 705))
(tests/unlimited/simple-exp.s (mipsy/c/8_simple-exp 1.2 604))
(tests/unlimited/simple-exp.s (mipsy/c/8_simple-exp 1.2 644))
)
(Populate-Ignore
......
......@@ -36,9 +36,6 @@ namespace inst
class DataSection:
public Section
{
typedef std::list<const Label*> label_list_t;
typedef std::map<Label, int> label_to_offset_t;
public:
DataSection():
_size(0)
......@@ -108,10 +105,10 @@ namespace inst
int i = 0;
while (i < _size)
{
std::map<int, label_list_t>::const_iterator it =
std::map<int, label_list_type>::const_iterator it =
labels.find(i);
if (it != labels.end())
for (label_list_t::const_iterator l = (*it).second.begin();
for (label_list_type::const_iterator l = (*it).second.begin();
l != (*it).second.end(); ++l)
ostr << *(*l) << ':' << std::endl;
......
......@@ -37,9 +37,9 @@ namespace inst
}
public:
virtual void visit(typename select_const<K, IntExp>::t&) = 0;
virtual void visit(typename select_const<K, LabelExp>::t&) = 0;
virtual void visit(typename select_const<K, OpExp>::t&) = 0;
virtual void visit(typename select_const<K, IntExp>::type&) = 0;
virtual void visit(typename select_const<K, LabelExp>::type&) = 0;
virtual void visit(typename select_const<K, OpExp>::type&) = 0;
};
typedef GenExpVisitor<const_kind> ConstExpVisitor;
......
......@@ -156,9 +156,9 @@ namespace inst
public Exp
{
public:
typedef enum { add, sub, mul, div } kind_t;
typedef enum { add, sub, mul, div } kind_type;
public:
OpExp(Exp& left, kind_t kind, Exp& right):
OpExp(Exp& left, kind_type kind, Exp& right):
kind(kind), left(left), right(right)
{
assertion(left && right);
......@@ -213,7 +213,7 @@ namespace inst
}
public:
const kind_t kind;
const kind_type kind;
protected:
Exp& left;
Exp& right;
......
......@@ -21,6 +21,6 @@
namespace inst
{
Label::string_set_t Label::_set;
Label::string_set_type Label::_set;
} // namespace inst
......@@ -28,8 +28,8 @@ namespace inst
class Label
{
typedef std::set<std::string> string_set_t;
typedef string_set_t::size_type size_type;
typedef std::set<std::string> string_set_type;
typedef string_set_type::size_type size_type;
public:
explicit Label (const std::string &s):
......@@ -64,9 +64,9 @@ namespace inst
}
private:
static string_set_t _set;
static string_set_type _set;
const string_set_t::const_iterator _set_node;
const string_set_type::const_iterator _set_node;
};
inline std::ostream&
......
......@@ -32,11 +32,11 @@ namespace inst
class Section
{
protected:
typedef std::list<const Label*> label_list_t;
typedef std::list<const Label*> label_list_type;
public:
typedef std::map<int, label_list_t> offset_label_t;
typedef std::map<const Label, int> label_offset_t;
typedef std::map<int, label_list_type> offset_label_type;
typedef std::map<const Label, int> label_offset_type;
public:
Section()
......@@ -56,18 +56,18 @@ namespace inst
public:
bool has_label(const Label& label) const
{
label_offset_t::const_iterator it = offsets.find(label);
label_offset_type::const_iterator it = offsets.find(label);
return it != offsets.end();
}
int get_offset(const Label& label) const
{
label_offset_t::const_iterator it = offsets.find(label);
label_offset_type::const_iterator it = offsets.find(label);
assertion(it != offsets.end());
return (*it).second;
}
const label_offset_t& get_offsets() const
const label_offset_type& get_offsets() const
{
return offsets;
}
......@@ -77,8 +77,8 @@ namespace inst
protected:
// FIXME: Might be static, to avoid multi-definition of labels.
offset_label_t labels;
label_offset_t offsets;
offset_label_type labels;
label_offset_type offsets;
};
inline std::ostream&
......
......@@ -79,10 +79,10 @@ namespace inst
ostr << "\t.text" << std::endl;
for (unsigned i = 0; i < insts.size(); ++i)
{
std::map<int, label_list_t>::const_iterator it =
std::map<int, label_list_type>::const_iterator it =
labels.find(i);
if (it != labels.end())
for (label_list_t::const_iterator l = (*it).second.begin();
for (label_list_type::const_iterator l = (*it).second.begin();
l != (*it).second.end(); ++l)
ostr << *(*l) << ':' << std::endl;
......
......@@ -7,12 +7,12 @@ struct non_const_kind {};
template <typename K, typename T>
struct select_const
{
typedef T t;
typedef T type;
};
template <typename T>
struct select_const<const_kind, T>
{
typedef const T t;
typedef const T type;
};
#endif // !MISC_SELECT_CONST_HH
......@@ -58,8 +58,8 @@ namespace task
return _description;
}
typedef std::list<std::string> deps_t;
const deps_t& dependencies(void) const
typedef std::list<std::string> deps_type;
const deps_type& dependencies(void) const
{
return _dependencies;
}
......@@ -69,7 +69,7 @@ namespace task
std::string _short_opt;
std::string _module;
std::string _description;
deps_t _dependencies;
deps_type _dependencies;
};
......
......@@ -83,7 +83,7 @@ namespace task
return;
visited_tasks.insert(task);
for (Task::deps_t::const_iterator it = task->dependencies ().begin ();
for (Task::deps_type::const_iterator it = task->dependencies ().begin ();
it != task->dependencies ().end (); ++it)
{
std::string name = "--" + (*it);
......
......@@ -146,9 +146,9 @@ namespace vm
void
Cpu::visit(const inst::Sll& sll)
{
uregister_t a = get_register(sll.get_src ());
uregister_type a = get_register(sll.get_src ());
unsigned i = sll.get_imm ();
register_t c = a << i;
register_type c = a << i;
set_register(sll.get_dest (), c);
// FIXME: Check overflow !
......@@ -156,10 +156,10 @@ namespace vm
void
Cpu::visit(const inst::Sllv& slv)
{
uregister_t a = get_register(slv.get_src1 ());
uregister_t b = get_register(slv.get_src2 ());
uregister_type a = get_register(slv.get_src1 ());
uregister_type b = get_register(slv.get_src2 ());
register_t c = a << b;
register_type c = a << b;
set_register(slv.get_dest (), c);
// FIXME: Check overflow !
......@@ -168,9 +168,9 @@ namespace vm
void
Cpu::visit(const inst::Sra& sra)
{
register_t a = get_register(sra.get_src ());
register_type a = get_register(sra.get_src ());
unsigned b = sra.get_imm ();
register_t c = a >> b;
register_type c = a >> b;
set_register(sra.get_dest (), c);
// FIXME: Check overflow !
......@@ -178,10 +178,10 @@ namespace vm
void
Cpu::visit(const inst::Srav& srav)
{
register_t a = get_register(srav.get_src1 ());
register_t b = get_register(srav.get_src2 ());
register_type a = get_register(srav.get_src1 ());
register_type b = get_register(srav.get_src2 ());
register_t c = a >> b;
register_type c = a >> b;
set_register(srav.get_dest (), c);
// FIXME: Check overflow !
......@@ -190,9 +190,9 @@ namespace vm
void
Cpu::visit(const inst::Srl& srl)
{
uregister_t a = get_register(srl.get_src ());
uregister_type a = get_register(srl.get_src ());
unsigned i = srl.get_imm ();
uregister_t c = a >> i;
uregister_type c = a >> i;
set_register(srl.get_dest (), c);
// FIXME: Check overflow !
......@@ -200,9 +200,9 @@ namespace vm
void
Cpu::visit(const inst::Srlv& srlv)
{
uregister_t a = get_register(srlv.get_src1 ());
uregister_t b = get_register(srlv.get_src2 ());
uregister_t c = a >> b;
uregister_type a = get_register(srlv.get_src1 ());
uregister_type b = get_register(srlv.get_src2 ());
uregister_type c = a >> b;
set_register(srlv.get_dest (), c);
// FIXME: Check overflow !
......@@ -212,10 +212,10 @@ namespace vm
void
Cpu::visit(const inst::Mul& mul)
{
register_t a = get_register(mul.get_src1 ());
register_t b = get_register(mul.get_src2 ());
register_type a = get_register(mul.get_src1 ());
register_type b = get_register(mul.get_src2 ());
register_t c = a * b;
register_type c = a * b;
set_register(mul.get_dest (), c);
// FIXME: Check overflow !
......@@ -224,10 +224,10 @@ namespace vm
void
Cpu::visit(const inst::Div& div)
{
register_t a = get_register(div.get_src1 ());
register_t b = get_register(div.get_src2 ());
register_type a = get_register(div.get_src1 ());
register_type b = get_register(div.get_src2 ());
register_t c = a / b;
register_type c = a / b;
set_lo(c);
c = a % b;
......@@ -238,8 +238,8 @@ namespace vm
void
Cpu::visit(const inst::Divu& divu)
{
uregister_t a = get_register(divu.get_src1 ());
uregister_t b = get_register(divu.get_src2 ());
uregister_type a = get_register(divu.get_src1 ());
uregister_type b = get_register(divu.get_src2 ());
set_lo(a / b);
set_hi(a % b);
......@@ -253,67 +253,67 @@ namespace vm