Merge pull request #10 from xyproto/strings

andoma · web-flow · commit f7ba2fa46faa · 2018-08-11T07:22:29.000-07:00
Minor changes to strings and comments
diff --git a/src/main.c b/src/main.c
@@ -125,7 +125,7 @@ main(int argc, char **argv)
   }
 
   if(optind >= argc) {
-    fprintf(stderr, "Need .bc file to parse/run\n");
+    fprintf(stderr, "Please provide a .wasm or .bc file as the first argument.\n");
     exit(1);
   }
 
diff --git a/src/vmir.c b/src/vmir.c
@@ -914,7 +914,7 @@ vmir_load(ir_unit_t *iu, const uint8_t *u8, int len)
     break;
 
   case 0xdec04342: // LLVM Bitcode
-    // Webassembly need memory at 0. Bitcode dont really.
+    // WebAssembly need memory at 0. Bitcode don't really.
     iu->iu_data_ptr = 4096;
     ir_parse_blocks(iu, 2, NULL, NULL, &bs);
     break;
diff --git a/src/vmir.h b/src/vmir.h
@@ -166,7 +166,7 @@ vmir_errcode_t vmir_load(ir_unit_t *iu, const uint8_t *bitcode,
 
 /**
  * Destroy the environment and free all resources except the memory
- * passed in to vmir_create(). THe user is responsible for freeing this
+ * passed in to vmir_create(). The user is responsible for freeing this
  * memory.
  *
  * After this the ir_unit is also free'd and no longer available
@@ -300,7 +300,7 @@ uint32_t vmir_mem_copy(ir_unit_t *iu, const void *data, size_t size);
 void vmir_mem_free(ir_unit_t *iu, uint32_t addr);
 
 /**
- * Filedescriptors
+ * File descriptors
  */
 #define VMIR_FD_TYPE_FILEHANDLE 1
 #define VMIR_FD_TYPE_SOCKET     2
diff --git a/src/vmir_bitcode_instr.c b/src/vmir_bitcode_instr.c
@@ -474,7 +474,7 @@ parse_call_or_invoke(ir_unit_t *iu, unsigned int argc, const int64_t *argv,
     fnty = type_get(iu, type_get_pointee(iu, fn->iv_type));
     break;
   default:
-    parser_error(iu, "Funcation call via value '%s' not supported",
+    parser_error(iu, "Function call via value '%s' not supported",
                  value_str(iu, fn));
     break;
   }
diff --git a/src/vmir_jit_arm.c b/src/vmir_jit_arm.c
@@ -1063,7 +1063,7 @@ jit_emit_conditional_branch(ir_unit_t *iu, int true_bb, int false_bb, int pred,
 
   if(tib->ib_jit) {
     if(tib->ib_only_jit_sucessors && TAILQ_NEXT(curbb, ib_link) == tib) {
-      // Jumping to consecustive BB can be skipped
+      // Jumping to consecutive BB can be skipped
       false_cond = armcond(invert_pred(pred));
       may_push_pool = 0;
     } else {
@@ -1080,7 +1080,7 @@ jit_emit_conditional_branch(ir_unit_t *iu, int true_bb, int false_bb, int pred,
 
   if(fib->ib_jit) {
     if(fib->ib_only_jit_sucessors && TAILQ_NEXT(curbb, ib_link) == fib) {
-      // Jumping to consecustive BB can be skipped
+      // Jumping to consecutive BB can be skipped
       may_push_pool = 0;
     } else {
       // Jumping to another JITen instruction, emit a branch
@@ -1129,7 +1129,7 @@ jit_br(ir_unit_t *iu, ir_instr_br_t *ii, jitctx_t *jc, ir_bb_t *curbb)
   ir_bb_t *ib = bb_find(iu->iu_current_function, ii->true_branch);
   if(ib->ib_jit) {
     if(TAILQ_NEXT(curbb, ib_link) == ib && ib->ib_only_jit_sucessors) {
-      // Jumping to consecustive BB can be skipped
+      // Jumping to consecutive BB can be skipped
       return;
     }
     // Jumping to another JITed BB, emit a branch
diff --git a/src/vmir_transform.c b/src/vmir_transform.c
@@ -1182,7 +1182,7 @@ break_critical_edge(ir_function_t *f, ir_bb_edge_t *ibe)
   // Create new edge from new bb to target bb
   cfg_add_edge(f, nb, to->ib_id, 0);
 
-  // Adjust final instrction of previous bb to point to new bb
+  // Adjust final instruction of previous bb to point to new bb
   bb_change_branch(from, to, nb, f);
 
   ir_instr_t *ii;
@@ -2645,7 +2645,7 @@ static void
 legalize_aggregate_insertval(ir_unit_t *iu, ir_instr_insertval_t *ins)
 {
   if(ins->num_indicies != 1) {
-    parser_error(iu, "Unable to legalize insertval with %d indicies",
+    parser_error(iu, "Unable to legalize insertval with %d indices",
                  ins->num_indicies);
   }
 
@@ -2722,7 +2722,7 @@ legalize_aggregate(ir_unit_t *iu, ir_value_t *iv)
           ir_instr_extractval_t *iie = (ir_instr_extractval_t *)ii;
 
           if(iie->num_indicies != 1) {
-            parser_error(iu, "Unable to legalize extractval with %d indicies",
+            parser_error(iu, "Unable to legalize extractval with %d indices",
                          iie->num_indicies);
           }
 
diff --git a/src/vmir_vm.c b/src/vmir_vm.c
@@ -3624,7 +3624,7 @@ emit_br(ir_unit_t *iu, ir_instr_br_t *ii, ir_bb_t *currentib)
   if(ii->condition.value == -1) {
     ir_bb_t *next = TAILQ_NEXT(currentib, ib_link);
     if(next != NULL && next->ib_id == ii->true_branch) {
-      // Jump to next bb is NOP as basic-blocks are contigous in memory
+      // Jump to next bb is NOP as basic-blocks are contiguous in memory
       VECTOR_POP(&iu->iu_branch_fixups);
       return;
     }
@@ -3806,12 +3806,12 @@ emit_move(ir_unit_t *iu, ir_instr_move_t *ii)
 
     if(v1->iv_reg + 4 != v2->iv_reg ||
        ii->super.ii_rets[0].type != ii->super.ii_rets[1].type)
-      parser_error(iu, "Bad aggregate destionation for move");
+      parser_error(iu, "Bad aggregate destination for move");
 
     const ir_type_t *ty = type_get(iu, ii->super.ii_rets[0].type);
     typecode = legalize_type(ty);
     if(typecode != IR_TYPE_INT32)
-      parser_error(iu, "Bad aggregate destionation type for move");
+      parser_error(iu, "Bad aggregate destination type for move");
 
     // Merge to one 64bit reg
     retreg = value_reg(v1);

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ main(int argc, char **argv)`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`if(optind >= argc) {`
`128`		`- fprintf(stderr, "Need .bc file to parse/run\n");`
	`128`	`+ fprintf(stderr, "Please provide a .wasm or .bc file as the first argument.\n");`
`129`	`129`	`exit(1);`
`130`	`130`	`}`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ parse_call_or_invoke(ir_unit_t iu, unsigned int argc, const int64_t argv,`
`474`	`474`	`fnty = type_get(iu, type_get_pointee(iu, fn->iv_type));`
`475`	`475`	`break;`
`476`	`476`	`default:`
`477`		`- parser_error(iu, "Funcation call via value '%s' not supported",`
	`477`	`+ parser_error(iu, "Function call via value '%s' not supported",`
`478`	`478`	`value_str(iu, fn));`
`479`	`479`	`break;`
`480`	`480`	`}`