X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=sim%2Fucsim%2Ferror.cc;h=a8c533bbc7f5d40bce7ca99ad00fbe83631be4ec;hb=f27da39dbcab5678aca6d8462f1cc37a643f37e9;hp=7f3fa5d604175fc49c6b3148f4ba3afec381dd05;hpb=7fe573ea83f6e0762dc73bc493f15fa2a8f6273d;p=fw%2Fsdcc

diff --git a/sim/ucsim/error.cc b/sim/ucsim/error.cc
index 7f3fa5d6..a8c533bb 100644
--- a/sim/ucsim/error.cc
+++ b/sim/ucsim/error.cc
@@ -7,42 +7,208 @@
  *
  */
 
-/* This file is part of microcontroller simulator: ucsim.
-
-UCSIM is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-UCSIM is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with UCSIM; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA. */
+/*
+  This file is part of microcontroller simulator: ucsim.
+
+  UCSIM is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  UCSIM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with UCSIM; see the file COPYING.  If not, write to the Free
+  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
 /*@1@*/
 
+#include <stdlib.h>
+#include "i_string.h"
+
 // prj (local)
 #include "errorcl.h"
+#include "globals.h"
+#include "utils.h"
 
 // cmd.src
 #include "newcmdcl.h"
 
+struct id_element error_on_off_names[]= {
+  { ERROR_PARENT, "unset" },
+  { ERROR_ON	, "on" },
+  { ERROR_OFF	, "off" },
+  { 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):
+  cl_base()
+{
+  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,
+			       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):
+  cl_base()
+{
+  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);
+}
+
+void
+cl_error_class::set_on(enum error_on_off val)
+{
+  if (!get_parent() &&
+      val == ERROR_PARENT)
+    return;
+  on= val;
+}
+
+bool
+cl_error_class::is_on(void)
+{
+  if (on == ERROR_PARENT)
+    {
+      if (!get_parent())
+	return(DD_TRUE);
+      class cl_error_class *p=
+	dynamic_cast<class cl_error_class *>(get_parent());
+      return(p->is_on());
+    }
+  else
+    return(on == ERROR_ON);
+}
+
+enum error_type
+cl_error_class::get_type(void)
+{
+  return(type);
+}
+
+/*char *
+cl_error_class::get_name(void)
+{
+  return(name);
+}*/
+
+char *
+cl_error_class::get_type_name()
+{
+  return(get_id_string(error_type_names, type, "untyped"));
+  /*switch (type)
+    {
+    case err_unknown: return("unclassified"); break;
+    case err_error: return("error"); break;
+    case err_warning: return("warning"); break;
+    }
+    return("untyped");*/
+}
+
+
+/*
+ */
 
 cl_error::cl_error(void):
   cl_base()
-{}
+{
+  //type= err_unknown;
+  classification= 0;
+}
 
 cl_error::~cl_error(void)
 {}
 
+int
+cl_error::init(void)
+{
+  //type= get_type();
+  return(0);
+}
+
+enum error_type
+cl_error::get_type(void)
+{
+  if (classification)
+    return(classification->get_type());
+  return(err_unknown);
+}
+
+enum error_on_off
+cl_error::get_on(void)
+{
+  if (!classification)
+    return(ERROR_ON);
+  return(classification->get_on());
+}
+
+bool
+cl_error::is_on(void)
+{
+  if (!classification)
+    return(DD_TRUE);
+  return(classification->is_on());
+}
+
 void
 cl_error::print(class cl_commander *c)
 {
-  c->dd_printf("Error\n");
+  c->dd_printf("%s\n", get_type_name());
+}
+
+char *
+cl_error::get_type_name()
+{
+  enum error_type type= get_type();
+  return(get_id_string(error_type_names, type, "untyped"));
 }