* sim/ucsim/error.cc, sim/ucsim/errorcl.h,

[fw/sdcc] / sim / ucsim / error.cc

diff --git a/sim/ucsim/error.cc b/sim/ucsim/error.cc
index b63a9bf5183cdbedfc619491c1c577c28d547834..5b125a8c545346f389029dfab86712512e4c2c39 100644 (file)
--- a/sim/ucsim/error.cc
+++ b/sim/ucsim/error.cc
@@ -45,7 +45,9 @@ struct id_element error_on_off_names[]= {
   { 0          , 0 }
 };
 
-class cl_list *registered_errors= NIL;
+static class cl_error_registry error_registry;
+
+class cl_list *cl_error_registry::registered_errors= NIL;
 
 /*
  */
@@ -57,9 +59,6 @@ cl_error_class::cl_error_class(enum error_type typ, char *aname,
   type= typ;
   on= be_on;
   set_name(aname, "not-known");
-  if (!registered_errors)
-    registered_errors= new cl_list(2, 2, "registered errors");
-  registered_errors->add(this);
 }
 
 cl_error_class::cl_error_class(enum error_type typ, char *aname,
@@ -70,9 +69,6 @@ cl_error_class::cl_error_class(enum error_type typ, char *aname,
   type= typ;
   on= be_on;
   set_name(aname, "not-known");
-  if (!registered_errors)
-    registered_errors= new cl_list(2, 2, "registered errors");
-  registered_errors->add(this);
   if (parent)
     parent->add_child(this);
 }
@@ -130,15 +126,10 @@ cl_error_class::get_type_name()
 /*
  */
 
-class cl_error_class *cl_error::error_class_base;
-
 cl_error::cl_error(void):
   cl_base()
 {
-  if (NULL == error_class_base)
-    error_class_base = new cl_error_class(err_error, "non-classified", ERROR_ON);
-  //type= err_unknown;
-  classification= error_class_base;
+  classification= error_registry.find("non-classified");
 }
 
 cl_error::~cl_error(void)
@@ -188,5 +179,11 @@ cl_error::get_type_name()
   return(get_id_string(error_type_names, type, "untyped"));
 }
 
+cl_error_registry::cl_error_registry(void)
+{
+  if (NULL == error_registry.find("non-classified"))
+    register_error(new cl_error_class(err_error, "non-classified", ERROR_ON));
+}
+
 
 /* End of sim.src/error.cc */