PRJ3 Refactoring and Some Error Resolve

limdongjin · May 3, 2019 · 03d2190 · 03d2190
1 parent b8b3815
commit 03d2190
Show file tree

Hide file tree

Showing 2 changed files with 298 additions and 348 deletions.
diff --git a/command_execute.c b/command_execute.c
@@ -293,20 +293,28 @@ shell_status execute_progaddr(Command *user_command, State *state_store) {
 
 /*
  * run 명령어
- * [TODO] run 명령어 실행 구현 하기!
  */
 shell_status execute_run(State *state_store){
     bool status;
     if(!state_store->debugger_state->is_loaded){
         fprintf(stderr, "[ERROR] Not Loaded\n");
         return EXECUTE_FAIL;
     }
+    if(state_store->debugger_state->file_count != 1){
+        fprintf(stderr, "[ERROR] Only Support One Object Run\n");
+        fprintf(stderr, "[ERROR] Must Re-Load\n");
+        return EXECUTE_FAIL;
+    }
     if(!state_store->debugger_state->is_running){
         state_store->debugger_state->registers->PC = state_store->debugger_state->start_address;
     }
 
     status = run(state_store->debugger_state, state_store->memories_state);
-    if(!status) return EXECUTE_FAIL;
+    if(!status){
+        state_store->debugger_state->is_running = false;
+        state_store->debugger_state->is_loaded = false;
+        return EXECUTE_FAIL;
+    }
 
     return EXECUTE_SUCCESS;
 }
@@ -361,7 +369,11 @@ shell_status execute_loader(Command *user_command, State *state_store) {
 
     state_store->debugger_state->file_count = user_command->token_cnt - 1;
     status = loader_linker(state_store->debugger_state, state_store->memories_state);
-    if(!status) return EXECUTE_FAIL;
+    if(!status){
+        for(int i = 0; i < 3; i++) state_store->debugger_state->filenames[i] = NULL;
+        state_store->debugger_state->file_count = 0;
+        return EXECUTE_FAIL;
+    }
 
     state_store->debugger_state->run_count = 0;
     state_store->debugger_state->previous_bp = -1;