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

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

diff --git a/sim/ucsim/error.cc b/sim/ucsim/error.cc
index a8c533bbc7f5d40bce7ca99ad00fbe83631be4ec..b63a9bf5183cdbedfc619491c1c577c28d547834 100644 (file)
--- a/sim/ucsim/error.cc
+++ b/sim/ucsim/error.cc
@@ -45,26 +45,13 @@ struct id_element error_on_off_names[]= {
   { 0          , 0 }
 };
 
-class cl_error_class error_class_base(err_error, "non-classified", ERROR_ON);
-
 class cl_list *registered_errors= NIL;
 
 /*
  */
 
-cl_error_class::cl_error_class(enum error_type typ, char *aname):
-  cl_base()
-{
-  type= typ;
-  on= ERROR_PARENT;
-  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,
-                              enum error_on_off be_on):
+                              enum error_on_off be_on/* = ERROR_PARENT*/):
   cl_base()
 {
   type= typ;
@@ -75,23 +62,9 @@ cl_error_class::cl_error_class(enum error_type typ, char *aname,
   registered_errors->add(this);
 }
 
-cl_error_class::cl_error_class(enum error_type typ, char *aname,
-                              class cl_error_class *parent):
-  cl_base()
-{
-  type= typ;
-  on= ERROR_PARENT;
-  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);
-}
-
 cl_error_class::cl_error_class(enum error_type typ, char *aname,
                               class cl_error_class *parent,
-                              enum error_on_off be_on):
+                              enum error_on_off be_on/* = ERROR_PARENT*/):
   cl_base()
 {
   type= typ;
@@ -157,11 +130,15 @@ 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= 0;
+  classification= error_class_base;
 }
 
 cl_error::~cl_error(void)