summaryrefslogtreecommitdiff
path: root/mixlib
diff options
context:
space:
mode:
Diffstat (limited to 'mixlib')
-rw-r--r--mixlib/mix_eval.c2
-rw-r--r--mixlib/mix_eval.h2
-rw-r--r--mixlib/mix_symbol_table.c2
-rw-r--r--mixlib/mix_symbol_table.h2
-rw-r--r--mixlib/mix_types.h2
-rw-r--r--mixlib/mix_vm.c2
-rw-r--r--mixlib/xmix_vm.c2
-rw-r--r--mixlib/xmix_vm.h2
8 files changed, 8 insertions, 8 deletions
diff --git a/mixlib/mix_eval.c b/mixlib/mix_eval.c
index 64ae476..a942bdb 100644
--- a/mixlib/mix_eval.c
+++ b/mixlib/mix_eval.c
@@ -183,7 +183,7 @@ mix_eval_remove_symbols_from_table (mix_eval_t *eval,
{
g_return_val_if_fail (eval != NULL, FALSE);
if (eval->table != NULL)
- return mix_symbol_table_substract_table (eval->table, table);
+ return mix_symbol_table_subtract_table (eval->table, table);
else
return FALSE;
}
diff --git a/mixlib/mix_eval.h b/mixlib/mix_eval.h
index 2a1672e..b1353e4 100644
--- a/mixlib/mix_eval.h
+++ b/mixlib/mix_eval.h
@@ -32,7 +32,7 @@ typedef struct mix_eval_t mix_eval_t;
/* possible evaluation outcomes*/
typedef enum {
- MIX_EVAL_OK, /* sucess*/
+ MIX_EVAL_OK, /* success*/
MIX_EVAL_SYNTAX, /* syntax error */
MIX_EVAL_INV_FSPEC, /* out of range fspec */
MIX_EVAL_MIS_PAREN, /* mismatched parenthesis */
diff --git a/mixlib/mix_symbol_table.c b/mixlib/mix_symbol_table.c
index 69bbd30..524b2db 100644
--- a/mixlib/mix_symbol_table.c
+++ b/mixlib/mix_symbol_table.c
@@ -97,7 +97,7 @@ mix_symbol_table_merge_table (mix_symbol_table_t *table,
}
gboolean
-mix_symbol_table_substract_table (mix_symbol_table_t *table,
+mix_symbol_table_subtract_table (mix_symbol_table_t *table,
const mix_symbol_table_t *other)
{
g_return_val_if_fail (table != NULL, FALSE);
diff --git a/mixlib/mix_symbol_table.h b/mixlib/mix_symbol_table.h
index 904c828..b477879 100644
--- a/mixlib/mix_symbol_table.h
+++ b/mixlib/mix_symbol_table.h
@@ -53,7 +53,7 @@ mix_symbol_table_merge_table (mix_symbol_table_t *table,
const mix_symbol_table_t *from);
extern gboolean
-mix_symbol_table_substract_table (mix_symbol_table_t *table,
+mix_symbol_table_subtract_table (mix_symbol_table_t *table,
const mix_symbol_table_t *other);
/* Add/remove symbols one by one */
diff --git a/mixlib/mix_types.h b/mixlib/mix_types.h
index 8bea145..7ffdb9d 100644
--- a/mixlib/mix_types.h
+++ b/mixlib/mix_types.h
@@ -50,7 +50,7 @@ typedef guint8 mix_byte_t;
/* Operations */
/* Addition */
#define mix_byte_add(x,y) mix_byte_new((x) + (y))
-/* Substraction */
+/* Subtraction */
#define mix_byte_sub(x,y) mix_byte_new((x) - (y))
/* Product */
#define mix_byte_mul(x,y) mix_byte_new((x) * (y))
diff --git a/mixlib/mix_vm.c b/mixlib/mix_vm.c
index d714bba..7f8cd99 100644
--- a/mixlib/mix_vm.c
+++ b/mixlib/mix_vm.c
@@ -525,7 +525,7 @@ mix_vm_get_error_string (mix_vm_error_t code)
N_("Cannot access device for reading"),
N_("Cannot access device for writing"),
N_("Unexpected error"),
- N_("Unknow error code")
+ N_("Unknown error code")
};
return errors[code > MIX_VM_ERROR_UNEXPECTED ?
diff --git a/mixlib/xmix_vm.c b/mixlib/xmix_vm.c
index cf20ee1..aebca87 100644
--- a/mixlib/xmix_vm.c
+++ b/mixlib/xmix_vm.c
@@ -23,7 +23,7 @@
#include "xmix_vm.h"
-/* auxiliar functions */
+/* auxiliary functions */
G_INLINE_FUNC mix_address_t
get_M_ (const mix_vm_t *vm, const mix_ins_t *ins);
G_INLINE_FUNC mix_word_t
diff --git a/mixlib/xmix_vm.h b/mixlib/xmix_vm.h
index 0d6605f..35f4259 100644
--- a/mixlib/xmix_vm.h
+++ b/mixlib/xmix_vm.h
@@ -52,7 +52,7 @@ struct mix_vm_t
mix_device_t * devices[BD_NO_];
mix_address_t start_addr; /* start address of loaded file */
GTree *line_table; /* source line no -> address */
- GTree *address_table; /* adress -> source line no */
+ GTree *address_table; /* address -> source line no */
gint8 bp[MEM_CELLS_NO_/8]; /* each bit signals a break point */
mix_vm_clock_t *clock; /* the vm clock */
mix_symbol_table_t *symbol_table;