From 3f27200f88ba91bd4a898a67bbb89c626757c13f Mon Sep 17 00:00:00 2001 From: Richard Cornwell Date: Sat, 2 Dec 2017 21:04:44 -0500 Subject: [PATCH] B5500: Cleanup some coverity errors. --- B5500/b5500_cpu.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/B5500/b5500_cpu.c b/B5500/b5500_cpu.c index 832a4489..db301cfd 100644 --- a/B5500/b5500_cpu.c +++ b/B5500/b5500_cpu.c @@ -3894,20 +3894,21 @@ cpu_set_size(UNIT * uptr, int32 val, CONST char *cptr, void *desc) { t_uint64 mc = 0; uint32 i; + int32 v; + v = val >> UNIT_V_MSIZE; + v = (v + 1) * 4096; + if ((v < 0) || (v > MAXMEMSIZE)) + return SCPE_ARG; + for (i = v-1; i < MEMSIZE; i++) + mc |= M[i]; + if ((mc != 0) && (!get_yn("Really truncate memory [N]?", FALSE))) + return SCPE_OK; cpu_unit[0].flags &= ~UNIT_MSIZE; cpu_unit[0].flags |= val; cpu_unit[1].flags &= ~UNIT_MSIZE; cpu_unit[1].flags |= val; - val >>= UNIT_V_MSIZE; - val = (val + 1) * 4096; - if ((val < 0) || (val > MAXMEMSIZE)) - return SCPE_ARG; - for (i = val; i < MEMSIZE; i++) - mc |= M[i]; - if ((mc != 0) && (!get_yn("Really truncate memory [N]?", FALSE))) - return SCPE_OK; - MEMSIZE = val; + MEMSIZE = v; for (i = MEMSIZE; i < MAXMEMSIZE; i++) M[i] = 0; return SCPE_OK;