Changes in uspace/app/sbi/src/run.c [23de644:1ebc1a62] in mainline

File:

• uspace/app/sbi/src/run.c (modified) (14 diffs)

uspace/app/sbi/src/run.c

@@ -32 +32 @@
 #include <stdlib.h>
 #include <assert.h>
-#include "bigint.h"
 #include "builtin.h"
 #include "debug.h"
@@ -58 +57 @@
 
 static bool_t run_exc_match(run_t *run, stree_except_t *except_c);
-static stree_csi_t *run_exc_payload_get_csi(run_t *run);
-
 static rdata_var_t *run_aprop_get_tpos(run_t *run, rdata_address_t *aprop);
 
@@ -116 +113 @@
         run_proc(run, proc_ar, &res);
 
-        run_exc_check_unhandled(run);
+        /* Check for unhandled exceptions. */
+        if (run->thread_ar->bo_mode != bm_none) {
+                assert(run->thread_ar->bo_mode == bm_exc);
+                printf("Error: Unhandled exception.\n");
+                exit(1);
+        }
 }
 
@@ -300 +302 @@
 
         var->u.int_v = int_v;
-        bigint_init(&int_v->value, 0);
+        int_v->value = 0;
 
         block_ar = run_get_current_block_ar(run);
@@ -327 +329 @@
 #endif
         run_expr(run, if_s->cond, &rcond);
-        if (run_is_bo(run))
-                return;
 
         if (run_item_boolean_value(run, rcond) == b_true) {
@@ -357 +357 @@
 #endif
         run_expr(run, while_s->cond, &rcond);
-        if (run_is_bo(run))
-                return;
 
         while (run_item_boolean_value(run, rcond) == b_true) {
                 run_block(run, while_s->body);
                 run_expr(run, while_s->cond, &rcond);
-                if (run_is_bo(run))
-                        return;
 
                 if (run->thread_ar->bo_mode != bm_none)
@@ -385 +381 @@
 #endif
         run_expr(run, raise_s->expr, &rexpr);
-        if (run_is_bo(run))
-                return;
-
         run_cvt_value_item(run, rexpr, &rexpr_vi);
 
@@ -408 +401 @@
 #endif
         run_expr(run, return_s->expr, &rexpr);
-        if (run_is_bo(run))
-                return;
-
         run_cvt_value_item(run, rexpr, &rexpr_vi);
 
@@ -487 +477 @@
  *
  * Checks if the currently active exception in the runner object @c run
- * matches except clause @c except_c.
+ * matches except clause @c except_c. Generates an error if the exception
+ * payload has invalid type (i.e. not an object).
  *
  * @param run           Runner object.
@@ -495 +486 @@
 static bool_t run_exc_match(run_t *run, stree_except_t *except_c)
 {
-        stree_csi_t *exc_csi;
+        rdata_value_t *payload;
+        rdata_var_t *payload_v;
+        rdata_object_t *payload_o;
         tdata_item_t *etype;
 
-        /* Get CSI of active exception. */
-        exc_csi = run_exc_payload_get_csi(run);
+        payload = run->thread_ar->exc_payload;
+        assert(payload != NULL);
+
+        if (payload->var->vc != vc_ref) {
+                printf("Error: Exception payload must be an object "
+                    "(found type %d).\n", payload->var->vc);
+                exit(1);
+        }
+
+        payload_v = payload->var->u.ref_v->vref;
+        if (payload_v->vc != vc_object) {
+                printf("Error: Exception payload must be an object "
+                    "(found type %d).\n", payload_v->vc);
+                exit(1);
+        }
+
+        payload_o = payload_v->u.object_v;
+
+#ifdef DEBUG_RUN_TRACE
+        printf("Active exception: '");
+        symbol_print_fqn(payload_o->class_sym);
+        printf("'.\n");
+#endif
+        assert(payload_o->class_sym != NULL);
+        assert(payload_o->class_sym->sc == sc_csi);
 
         /* Evaluate type expression in except clause. */
@@ -505 +521 @@
             &etype);
 
-        /* Determine if active exc. is derived from type in exc. clause. */
-        return tdata_is_csi_derived_from_ti(exc_csi, etype);
-}
-
-/** Return CSI of the active exception.
- *
- * @param run           Runner object.
- * @return              CSI of the active exception.
- */
-static stree_csi_t *run_exc_payload_get_csi(run_t *run)
-{
-        rdata_value_t *payload;
-        rdata_var_t *payload_v;
-        rdata_object_t *payload_o;
-
-        payload = run->thread_ar->exc_payload;
-        assert(payload != NULL);
-
-        if (payload->var->vc != vc_ref) {
-                /* XXX Prevent this via static type checking. */
-                printf("Error: Exception payload must be an object "
-                    "(found type %d).\n", payload->var->vc);
-                exit(1);
-        }
-
-        payload_v = payload->var->u.ref_v->vref;
-        if (payload_v->vc != vc_object) {
-                /* XXX Prevent this via static type checking. */
-                printf("Error: Exception payload must be an object "
-                    "(found type %d).\n", payload_v->vc);
-                exit(1);
-        }
-
-        payload_o = payload_v->u.object_v;
-
-#ifdef DEBUG_RUN_TRACE
-        printf("Active exception: '");
-        symbol_print_fqn(payload_o->class_sym);
-        printf("'.\n");
-#endif
-        assert(payload_o->class_sym != NULL);
-        assert(payload_o->class_sym->sc == sc_csi);
-
-        return payload_o->class_sym->u.csi;
-}
-
-
-/** Check for unhandled exception.
- *
- * Checks whether there is an active exception. If so, it prints an
- * error message and raises a run-time error.
- *
- * @param run           Runner object.
- */
-void run_exc_check_unhandled(run_t *run)
-{
-        stree_csi_t *exc_csi;
-
-        if (run->thread_ar->bo_mode != bm_none) {
-                assert(run->thread_ar->bo_mode == bm_exc);
-
-                exc_csi = run_exc_payload_get_csi(run);
-
-                printf("Error: Unhandled exception '");
-                symbol_print_fqn(csi_to_symbol(exc_csi));
-                printf("'.\n");
-
-                run_raise_error(run);
-        }
+        return tdata_is_csi_derived_from_ti(payload_o->class_sym->u.csi,
+            etype);
 }
 
@@ -671 +620 @@
 
                 (*var)->u.int_v = int_v;
-                bigint_clone(&item->u.value->var->u.int_v->value,
-                    &int_v->value);
+                int_v->value = item->u.value->var->u.int_v->value;
                 break;
         case vc_string:
@@ -1223 +1171 @@
 
         if (addr_var->vref == NULL) {
-#ifdef DEBUG_RUN_TRACE
                 printf("Error: Accessing null reference.\n");
-#endif
-                /* Raise Error.NilReference */
-                run_raise_exc(run, run->program->builtin->error_nilreference);
+                run_raise_error(run);
                 *ritem = run_recovery_item(run);
                 return;
@@ -1236 +1181 @@
 #endif
         *ritem = item;
-}
-
-/** Raise an exception of the given class.
- *
- * Used when the interpreter generates an exception due to a run-time
- * error (not for the @c raise statement).
- *
- * @param run           Runner object.
- * @param csi           Exception class.
- */
-void run_raise_exc(run_t *run, stree_csi_t *csi)
-{
-        rdata_item_t *exc_vi;
-
-        /* Create exception object. */
-        run_new_csi_inst(run, csi, &exc_vi);
-        assert(exc_vi->ic == ic_value);
-
-        /* Store exception object in thread AR. */
-        run->thread_ar->exc_payload = exc_vi->u.value;
-
-        /* Start exception bailout. */
-        run->thread_ar->bo_mode = bm_exc;
-}
-
-/** Determine if we are bailing out. */
-bool_t run_is_bo(run_t *run)
-{
-        return run->thread_ar->bo_mode != bm_none;
 }