From 09027955b16546c810aa00a49fe2c8049883e5f8 Mon Sep 17 00:00:00 2001 From: David Griffith Date: Sat, 21 Sep 2019 19:09:27 -0700 Subject: [PATCH] Convert table.c to K&R style. --- src/common/table.c | 159 +++++++++++++++++++-------------------------- 1 file changed, 67 insertions(+), 92 deletions(-) diff --git a/src/common/table.c b/src/common/table.c index 864fa63..361c647 100644 --- a/src/common/table.c +++ b/src/common/table.c @@ -32,35 +32,31 @@ * if zargs[1] is negative the table _must_ be copied forwards. * */ -void z_copy_table (void) +void z_copy_table(void) { - zword addr; - zword size = zargs[2]; - zbyte value; - int i; - - if (zargs[1] == 0) /* zero table */ - - for (i = 0; i < size; i++) - storeb ((zword) (zargs[0] + i), 0); - - else if ((short) size < 0 || zargs[0] > zargs[1]) /* copy forwards */ - - for (i = 0; i < (((short) size < 0) ? - (short) size : size); i++) { - addr = zargs[0] + i; - LOW_BYTE (addr, value) - storeb ((zword) (zargs[1] + i), value); + zword addr; + zword size = zargs[2]; + zbyte value; + int i; + + if (zargs[1] == 0) /* zero table */ + for (i = 0; i < size; i++) + storeb((zword) (zargs[0] + i), 0); + + else if ((short)size < 0 || zargs[0] > zargs[1]) { /* copy forwards */ + for (i = 0; i < (((short)size < 0) ? -(short)size : size); i++) { + addr = zargs[0] + i; + LOW_BYTE(addr, value) + storeb((zword) (zargs[1] + i), value); + } + } else { /* copy backwards */ + for (i = size - 1; i >= 0; i--) { + addr = zargs[0] + i; + LOW_BYTE(addr, value) + storeb((zword) (zargs[1] + i), value); + } } - - else /* copy backwards */ - - for (i = size - 1; i >= 0; i--) { - addr = zargs[0] + i; - LOW_BYTE (addr, value) - storeb ((zword) (zargs[1] + i), value); - } - -}/* z_copy_table */ +} /* z_copy_table */ /* @@ -70,16 +66,15 @@ void z_copy_table (void) * zargs[1] = index of table entry to store * */ -void z_loadb (void) +void z_loadb(void) { - zword addr = zargs[0] + zargs[1]; - zbyte value; + zword addr = zargs[0] + zargs[1]; + zbyte value; - LOW_BYTE (addr, value) + LOW_BYTE(addr, value) + store(value); - store (value); - -}/* z_loadb */ +} /* z_loadb */ /* @@ -89,16 +84,15 @@ void z_loadb (void) * zargs[1] = index of table entry to store * */ -void z_loadw (void) +void z_loadw(void) { - zword addr = zargs[0] + 2 * zargs[1]; - zword value; - - LOW_WORD (addr, value) + zword addr = zargs[0] + 2 * zargs[1]; + zword value; - store (value); + LOW_WORD(addr, value) + store(value); -}/* z_loadw */ +} /* z_loadw */ /* @@ -113,52 +107,35 @@ void z_loadw (void) * it's a byte array. The lower bits hold the address step. * */ -void z_scan_table (void) +void z_scan_table(void) { - zword addr = zargs[1]; - int i; - - /* Supply default arguments */ - - if (zargc < 4) - zargs[3] = 0x82; - - /* Scan byte or word array */ - - for (i = 0; i < zargs[2]; i++) { - - if (zargs[3] & 0x80) { /* scan word array */ - - zword wvalue; - - LOW_WORD (addr, wvalue) - - if (wvalue == zargs[0]) - goto finished; - - } else { /* scan byte array */ - - zbyte bvalue; - - LOW_BYTE (addr, bvalue) - - if (bvalue == zargs[0]) - goto finished; - + zword addr = zargs[1]; + int i; + + /* Supply default arguments */ + if (zargc < 4) + zargs[3] = 0x82; + + /* Scan byte or word array */ + for (i = 0; i < zargs[2]; i++) { + if (zargs[3] & 0x80) { /* scan word array */ + zword wvalue; + LOW_WORD(addr, wvalue) + if (wvalue == zargs[0]) + goto finished; + } else { /* scan byte array */ + zbyte bvalue; + LOW_BYTE(addr, bvalue) + if (bvalue == zargs[0]) + goto finished; + } + addr += zargs[3] & 0x7f; } - - addr += zargs[3] & 0x7f; - - } - - addr = 0; - + addr = 0; finished: - - store (addr); - branch (addr); - -}/* z_scan_table */ + store(addr); + branch(addr); +} /* z_scan_table */ /* @@ -169,11 +146,10 @@ finished: * zargs[2] = value to be written * */ -void z_storeb (void) +void z_storeb(void) { - storeb ((zword) (zargs[0] + zargs[1]), zargs[2]); - -}/* z_storeb */ + storeb((zword) (zargs[0] + zargs[1]), zargs[2]); +} /* z_storeb */ /* @@ -184,8 +160,7 @@ void z_storeb (void) * zargs[2] = value to be written * */ -void z_storew (void) +void z_storew(void) { - storew ((zword) (zargs[0] + 2 * zargs[1]), zargs[2]); - -}/* z_storew */ + storew((zword) (zargs[0] + 2 * zargs[1]), zargs[2]); +} /* z_storew */ -- 2.34.1