aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--monitor.c2
-rw-r--r--qemu-img.c2
-rw-r--r--target-ppc/cpu.h2
-rw-r--r--target-ppc/op.c12
4 files changed, 9 insertions, 9 deletions
diff --git a/monitor.c b/monitor.c
index 370bdfe981..a8db87040c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -784,7 +784,7 @@ static const KeyDef key_defs[] = {
{ 0xb5, "kp_divide" },
{ 0x37, "kp_multiply" },
- { 0x4a, "kp_substract" },
+ { 0x4a, "kp_subtract" },
{ 0x4e, "kp_add" },
{ 0x9c, "kp_enter" },
{ 0x53, "kp_decimal" },
diff --git a/qemu-img.c b/qemu-img.c
index 6b470a1506..e7d190b1e9 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -297,7 +297,7 @@ static int img_create(int argc, char **argv)
drv = bdrv_find_format(fmt);
if (!drv)
error("Unknown file format '%s'", fmt);
- printf("Formating '%s', fmt=%s",
+ printf("Formatting '%s', fmt=%s",
filename, fmt);
if (encrypted)
printf(", encrypted");
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 6b627f26b4..57e46620b7 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -1326,7 +1326,7 @@ enum {
EXCP_FP_ZX = 0x03, /* FP divide by zero */
EXCP_FP_XX = 0x04, /* FP inexact */
EXCP_FP_VXNAN = 0x05, /* FP invalid SNaN op */
- EXCP_FP_VXISI = 0x06, /* FP invalid infinite substraction */
+ EXCP_FP_VXISI = 0x06, /* FP invalid infinite subtraction */
EXCP_FP_VXIDI = 0x07, /* FP invalid infinite divide */
EXCP_FP_VXZDZ = 0x08, /* FP invalid zero divide */
EXCP_FP_VXIMZ = 0x09, /* FP invalid infinite * zero */
diff --git a/target-ppc/op.c b/target-ppc/op.c
index 019594c130..546f12a864 100644
--- a/target-ppc/op.c
+++ b/target-ppc/op.c
@@ -1025,7 +1025,7 @@ void OPPROTO op_nego_64 (void)
}
#endif
-/* substract from */
+/* subtract from */
PPC_OP(subf)
{
T0 = T1 - T0;
@@ -1058,7 +1058,7 @@ void OPPROTO op_check_subfo_64 (void)
}
#endif
-/* substract from carrying */
+/* subtract from carrying */
void OPPROTO op_check_subfc (void)
{
if (likely((uint32_t)T0 > (uint32_t)T1)) {
@@ -1081,7 +1081,7 @@ void OPPROTO op_check_subfc_64 (void)
}
#endif
-/* substract from extended */
+/* subtract from extended */
void OPPROTO op_subfe (void)
{
do_subfe();
@@ -1096,7 +1096,7 @@ void OPPROTO op_subfe_64 (void)
}
#endif
-/* substract from immediate carrying */
+/* subtract from immediate carrying */
void OPPROTO op_subfic (void)
{
T0 = (int32_t)PARAM1 + ~T0 + 1;
@@ -1121,7 +1121,7 @@ void OPPROTO op_subfic_64 (void)
}
#endif
-/* substract from minus one extended */
+/* subtract from minus one extended */
void OPPROTO op_subfme (void)
{
T0 = ~T0 + xer_ca - 1;
@@ -1154,7 +1154,7 @@ void OPPROTO op_subfmeo_64 (void)
}
#endif
-/* substract from zero extended */
+/* subtract from zero extended */
void OPPROTO op_subfze (void)
{
T1 = ~T0;