diff options
author | R. Belmont <rb6502@users.noreply.github.com> | 2009-06-10 21:45:49 +0000 |
---|---|---|
committer | R. Belmont <rb6502@users.noreply.github.com> | 2009-06-10 21:45:49 +0000 |
commit | 2561e0d8cd82e7c38f5d7a8ad83efbe3748beb5c (patch) | |
tree | e0a0c505da8fd9782e2a0765edaec063eda7d933 /src | |
parent | 68a74253b132ddfce424438b0e76c143626dd39f (diff) |
More GCC 4.4 fixes.
Using an editor with visual brace-matching helps a lot with these.
Diffstat (limited to 'src')
-rw-r--r-- | src/emu/machine/74148.c | 10 | ||||
-rw-r--r-- | src/emu/machine/74181.c | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/emu/machine/74148.c b/src/emu/machine/74148.c index 8d508706f65..1f5e98d8acf 100644 --- a/src/emu/machine/74148.c +++ b/src/emu/machine/74148.c @@ -81,21 +81,21 @@ void TTL74148_update(running_machine *machine, int which) int bit0, bit1, bit2; /* this comes straight off the data sheet schematics */ - bit0 = !((!chips[which].input_lines[1] & + bit0 = !(((!chips[which].input_lines[1]) & chips[which].input_lines[2] & chips[which].input_lines[4] & chips[which].input_lines[6]) | - (!chips[which].input_lines[3] & + ((!chips[which].input_lines[3]) & chips[which].input_lines[4] & chips[which].input_lines[6]) | - (!chips[which].input_lines[5] & + ((!chips[which].input_lines[5]) & chips[which].input_lines[6]) | (!chips[which].input_lines[7])); - bit1 = !((!chips[which].input_lines[2] & + bit1 = !(((!chips[which].input_lines[2]) & chips[which].input_lines[4] & chips[which].input_lines[5]) | - (!chips[which].input_lines[3] & + ((!chips[which].input_lines[3]) & chips[which].input_lines[4] & chips[which].input_lines[5]) | (!chips[which].input_lines[6]) | diff --git a/src/emu/machine/74181.c b/src/emu/machine/74181.c index 68e9b6d13c8..f7456de7218 100644 --- a/src/emu/machine/74181.c +++ b/src/emu/machine/74181.c @@ -74,18 +74,18 @@ static void TTL74181_update(int which) UINT8 mp = !c->inputs[TTL74181_INPUT_M]; UINT8 ap0 = !(a0 | (b0 & s0) | (s1 & !b0)); - UINT8 bp0 = !((!b0 & s2 & a0) | (a0 & b0 & s3)); + UINT8 bp0 = !(((!b0) & s2 & a0) | (a0 & b0 & s3)); UINT8 ap1 = !(a1 | (b1 & s0) | (s1 & !b1)); - UINT8 bp1 = !((!b1 & s2 & a1) | (a1 & b1 & s3)); + UINT8 bp1 = !(((!b1) & s2 & a1) | (a1 & b1 & s3)); UINT8 ap2 = !(a2 | (b2 & s0) | (s1 & !b2)); - UINT8 bp2 = !((!b2 & s2 & a2) | (a2 & b2 & s3)); + UINT8 bp2 = !(((!b2) & s2 & a2) | (a2 & b2 & s3)); UINT8 ap3 = !(a3 | (b3 & s0) | (s1 & !b3)); - UINT8 bp3 = !((!b3 & s2 & a3) | (a3 & b3 & s3)); + UINT8 bp3 = !(((!b3) & s2 & a3) | (a3 & b3 & s3)); - UINT8 fp0 = !(cp & mp) ^ (!ap0 & bp0); - UINT8 fp1 = (!((mp & ap0) | (mp & bp0 & cp))) ^ (!ap1 & bp1); - UINT8 fp2 = (!((mp & ap1) | (mp & ap0 & bp1) | (mp & cp & bp0 & bp1))) ^ (!ap2 & bp2); - UINT8 fp3 = (!((mp & ap2) | (mp & ap1 & bp2) | (mp & ap0 & bp1 & bp2) | (mp & cp & bp0 & bp1 & bp2))) ^ (!ap3 & bp3); + UINT8 fp0 = !(cp & mp) ^ ((!ap0) & bp0); + UINT8 fp1 = (!((mp & ap0) | (mp & bp0 & cp))) ^ ((!ap1) & bp1); + UINT8 fp2 = (!((mp & ap1) | (mp & ap0 & bp1) | (mp & cp & bp0 & bp1))) ^ ((!ap2) & bp2); + UINT8 fp3 = (!((mp & ap2) | (mp & ap1 & bp2) | (mp & ap0 & bp1 & bp2) | (mp & cp & bp0 & bp1 & bp2))) ^ ((!ap3) & bp3); UINT8 aeqb = fp0 & fp1 & fp2 & fp3; UINT8 pp = !(bp0 & bp1 & bp2 & bp3); |