Changeset fa36f29 in mainline for uspace/app/sbi/src/run.c

Timestamp:

2010-02-27T17:59:14Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

94d484a

Parents:

09ababb7

Message:

Update SBI to rev. 75.

File:

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

uspace/app/sbi/src/run.c

@@ -51 +51 @@
 static void run_if(run_t *run, stree_if_t *if_s);
 static void run_while(run_t *run, stree_while_t *while_s);
-
-static void run_value_item_to_var(rdata_item_t *item, rdata_var_t **var);
+static void run_return(run_t *run, stree_return_t *return_s);
 
 /** Initialize runner instance. */
 void run_init(run_t *run)
 {
+        (void) run;
 }
 
@@ -62 +62 @@
 void run_program(run_t *run, stree_program_t *prog)
 {
-        stree_symbol_t *main_class_sym;
         stree_symbol_t *main_fun_sym;
-        stree_csi_t *main_class;
         stree_fun_t *main_fun;
         stree_ident_t *fake_ident;
         list_t main_args;
+        run_fun_ar_t *fun_ar;
+        rdata_item_t *res;
 
         /* Note down link to program code. */
@@ -75 +75 @@
         run->thread_ar = run_thread_ar_new();
         list_init(&run->thread_ar->fun_ar);
+        run->thread_ar->bo_mode = bm_none;
 
         /*
-         * Resolve class @c HelloWorld
+         * Find entry point @c Main().
          */
         fake_ident = stree_ident_new();
-
-        fake_ident->sid = strtab_get_sid("HelloWorld");
-        main_class_sym = symbol_lookup_in_csi(prog, NULL, fake_ident);
-        main_class = symbol_to_csi(main_class_sym);
-        if (main_class == NULL) {
-                printf("Error: HelloWorld is not a CSI.\n");
-                exit(1);
-        }
-
-#ifdef DEBUG_RUN_TRACE
-        printf("Found class '"); symbol_print_fqn(prog, main_class_sym);
-        printf("'.\n");
-#endif
-
-        /*
-         * Resolve function @c main within the class.
-         */
-        fake_ident->sid = strtab_get_sid("main");
-        main_fun_sym = symbol_lookup_in_csi(prog, main_class, fake_ident);
+        fake_ident->sid = strtab_get_sid("Main");
+        main_fun_sym = symbol_find_epoint(prog, fake_ident);
+        if (main_fun_sym == NULL) {
+                printf("Error: Entry point 'Main' not found.\n");
+                exit(1);
+        }
+
         main_fun = symbol_to_fun(main_fun_sym);
-        if (main_fun == NULL) {
-                printf("Error: HelloWorld.main is not a function.\n");
-                exit(1);
-        }
+        assert(main_fun != NULL);
 
 #ifdef DEBUG_RUN_TRACE
@@ -110 +96 @@
 #endif
 
+        /* Run function @c main. */
         list_init(&main_args);
-        run_fun(run, main_fun, &main_args);
+        run_fun_ar_create(run, NULL, main_fun, &fun_ar);
+        run_fun_ar_set_args(run, fun_ar, &main_args);
+        run_fun(run, fun_ar, &res);
 }
 
 /** Run member function */
-void run_fun(run_t *run, stree_fun_t *fun, list_t *args)
+void run_fun(run_t *run, run_fun_ar_t *fun_ar, rdata_item_t **res)
 {
         stree_symbol_t *fun_sym;
-        run_fun_ar_t *fun_ar;
-        run_block_ar_t *block_ar;
-        list_node_t *rarg_n, *farg_n;
+        stree_fun_t *fun;
         list_node_t *node;
-        rdata_item_t *rarg;
-        stree_fun_arg_t *farg;
-        rdata_var_t *var;
-
-        fun_sym = fun_to_symbol(fun);
+
+        fun_sym = fun_ar->fun_sym;
+        fun = symbol_to_fun(fun_sym);
+        assert(fun != NULL);
 
 #ifdef DEBUG_RUN_TRACE
@@ -133 +119 @@
         printf("'.\n");
 #endif
-
-        /* Create function activation record. */
-        fun_ar = run_fun_ar_new();
-        fun_ar->fun_sym = fun_sym;
-        list_init(&fun_ar->block_ar);
-
         /* Add function AR to the stack. */
         list_append(&run->thread_ar->fun_ar, fun_ar);
-
-        /* Create special block activation record to hold function arguments. */
-        block_ar = run_block_ar_new();
-        intmap_init(&block_ar->vars);
-        list_append(&fun_ar->block_ar, block_ar);
-
-        /* Declare local variables to hold argument values. */
-        rarg_n = list_first(args);
-        farg_n = list_first(&fun->args);
-
-        while (farg_n != NULL) {
-                if (rarg_n == NULL) {
-                        printf("Error: Too few arguments to function '");
-                        symbol_print_fqn(run->program, fun_sym);
-                        printf("'.\n");
-                        exit(1);
-                }
-
-                rarg = list_node_data(rarg_n, rdata_item_t *);
-                farg = list_node_data(farg_n, stree_fun_arg_t *);
-
-                assert(rarg->ic == ic_value);
-
-                /* Construct a variable from the argument value. */
-                run_value_item_to_var(rarg, &var);
-
-                /* Declare variable using name of formal argument. */
-                intmap_set(&block_ar->vars, farg->name->sid, var);
-
-                rarg_n = list_next(args, rarg_n);
-                farg_n = list_next(&fun->args, farg_n);
-        }
-
-        /* Check for excess real parameters. */
-        if (rarg_n != NULL) {
-                printf("Error: Too many arguments to function '");
-                symbol_print_fqn(run->program, fun_sym);
-                printf("'.\n");
-                exit(1);
-        }
 
         /* Run main function block. */
@@ -189 +129 @@
         }
 
+        /* Handle bailout. */
+        switch (run->thread_ar->bo_mode) {
+        case bm_stat:
+                printf("Error: Misplaced 'break' statement.\n");
+                exit(1);
+        case bm_fun:
+                run->thread_ar->bo_mode = bm_none;
+                break;
+        default:
+                break;
+        }
+
 #ifdef DEBUG_RUN_TRACE
         printf("Done executing function '");
@@ -196 +148 @@
         run_print_fun_bt(run);
 #endif
-
         /* Remove function activation record from the stack. */
         node = list_last(&run->thread_ar->fun_ar);
         assert(list_node_data(node, run_fun_ar_t *) == fun_ar);
         list_remove(&run->thread_ar->fun_ar, node);
+
+        *res = fun_ar->retval;
 }
 
@@ -227 +180 @@
                 stat = list_node_data(node, stree_stat_t *);
                 run_stat(run, stat);
+
+                if (run->thread_ar->bo_mode != bm_none)
+                        break;
+
                 node = list_next(&block->stats, node);
         }
@@ -260 +217 @@
                 run_while(run, stat->u.while_s);
                 break;
+        case st_return:
+                run_return(run, stat->u.return_s);
+                break;
         case st_for:
         case st_raise:
@@ -361 +321 @@
                 run_block(run, while_s->body);
                 run_expr(run, while_s->cond, &rcond);
+
+                if (run->thread_ar->bo_mode != bm_none)
+                        break;
         }
 
@@ -366 +329 @@
         printf("While statement terminated.\n");
 #endif
+}
+
+/** Run @c return statement. */
+static void run_return(run_t *run, stree_return_t *return_s)
+{
+        rdata_item_t *rexpr;
+        run_fun_ar_t *fun_ar;
+
+#ifdef DEBUG_RUN_TRACE
+        printf("Executing return statement.\n");
+#endif
+        run_expr(run, return_s->expr, &rexpr);
+
+        /* Store expression result in function AR. */
+        fun_ar = run_get_current_fun_ar(run);
+        fun_ar->retval = rexpr;
+
+        /* Force control to ascend and leave the function. */
+        if (run->thread_ar->bo_mode == bm_none)
+                run->thread_ar->bo_mode = bm_fun;
 }
 
@@ -421 +404 @@
  * (2) Initialize the variable with the provided value.
  */
-static void run_value_item_to_var(rdata_item_t *item, rdata_var_t **var)
+void run_value_item_to_var(rdata_item_t *item, rdata_var_t **var)
 {
         rdata_int_t *int_v;
         rdata_string_t *string_v;
+        rdata_ref_t *ref_v;
         rdata_var_t *in_var;
 
@@ -445 +429 @@
                 string_v->value = item->u.value->var->u.string_v->value;
                 break;
+        case vc_ref:
+                *var = rdata_var_new(vc_ref);
+                ref_v = rdata_ref_new();
+
+                (*var)->u.ref_v = ref_v;
+                ref_v->vref = item->u.value->var->u.ref_v->vref;
+                break;
         default:
                 printf("Error: Unimplemented argument type.\n");
                 exit(1);
 
+        }
+}
+
+/** Construct a function AR. */
+void run_fun_ar_create(run_t *run, rdata_var_t *obj, stree_fun_t *fun,
+    run_fun_ar_t **rfun_ar)
+{
+        run_fun_ar_t *fun_ar;
+
+        (void) run;
+
+        /* Create function activation record. */
+        fun_ar = run_fun_ar_new();
+        fun_ar->obj = obj;
+        fun_ar->fun_sym = fun_to_symbol(fun);
+        list_init(&fun_ar->block_ar);
+
+        fun_ar->retval = NULL;
+
+        *rfun_ar = fun_ar;
+}
+
+/** Fill arguments in a function AR. */
+void run_fun_ar_set_args(run_t *run, run_fun_ar_t *fun_ar, list_t *args)
+{
+        stree_fun_t *fun;
+        run_block_ar_t *block_ar;
+        list_node_t *rarg_n, *farg_n;
+        rdata_item_t *rarg;
+        stree_fun_arg_t *farg;
+        rdata_var_t *var;
+
+        /* AR should have been created with run_fun_ar_create(). */
+        assert(fun_ar->fun_sym != NULL);
+        assert(list_is_empty(&fun_ar->block_ar));
+
+        fun = symbol_to_fun(fun_ar->fun_sym);
+        assert(fun != NULL);
+
+        /* Create special block activation record to hold function arguments. */
+        block_ar = run_block_ar_new();
+        intmap_init(&block_ar->vars);
+        list_append(&fun_ar->block_ar, block_ar);
+
+        /* Declare local variables to hold argument values. */
+        rarg_n = list_first(args);
+        farg_n = list_first(&fun->args);
+
+        while (farg_n != NULL) {
+                if (rarg_n == NULL) {
+                        printf("Error: Too few arguments to function '");
+                        symbol_print_fqn(run->program, fun_ar->fun_sym);
+                        printf("'.\n");
+                        exit(1);
+                }
+
+                rarg = list_node_data(rarg_n, rdata_item_t *);
+                farg = list_node_data(farg_n, stree_fun_arg_t *);
+
+                assert(rarg->ic == ic_value);
+
+                /* Construct a variable from the argument value. */
+                run_value_item_to_var(rarg, &var);
+
+                /* Declare variable using name of formal argument. */
+                intmap_set(&block_ar->vars, farg->name->sid, var);
+
+                rarg_n = list_next(args, rarg_n);
+                farg_n = list_next(&fun->args, farg_n);
+        }
+
+        /* Check for excess real parameters. */
+        if (rarg_n != NULL) {
+                printf("Error: Too many arguments to function '");
+                symbol_print_fqn(run->program, fun_ar->fun_sym);
+                printf("'.\n");
+                exit(1);
         }
 }