From 93a159875aa081cf3452754b890d83ae7c2bf943 Mon Sep 17 00:00:00 2001
From: Andreas Hansson <andreas.hansson@arm.com>
Date: Mon, 15 Oct 2012 08:12:23 -0400
Subject: Fix: Address a few minor issues identified by cppcheck

This patch addresses a number of smaller issues identified by the code
inspection utility cppcheck. There are a number of identified leaks in
the arm/linux/system.cc (although the function only get's called once
so it is not a major problem), a few deletes in dev/x86/i8042.cc that
were not array deletes, and sprintfs where the character array had one
element less than needed. In the IIC tags there was a function
allocating an array of longs which is in fact never used.
---
 src/mem/cache/tags/iic_repl/gen.cc  | 39 -------------------------------------
 src/mem/cache/tags/iic_repl/gen.hh  |  7 -------
 src/mem/cache/tags/iic_repl/repl.hh |  7 -------
 3 files changed, 53 deletions(-)

(limited to 'src/mem/cache')

diff --git a/src/mem/cache/tags/iic_repl/gen.cc b/src/mem/cache/tags/iic_repl/gen.cc
index 137130b27..3212b74ab 100644
--- a/src/mem/cache/tags/iic_repl/gen.cc
+++ b/src/mem/cache/tags/iic_repl/gen.cc
@@ -93,45 +93,6 @@ GenRepl::getRepl()
     return 0xffffffff;
 }
 
-unsigned long *
-GenRepl::getNRepl(int n)
-{
-    unsigned long *tmp;
-    GenReplEntry *re;
-    int i;
-    if (!(num_pool_entries>(n-1))) {
-        fatal("Not enough blks available to replace");
-    }
-    num_entries -= n;
-    num_pool_entries -= n;
-    tmp = new unsigned long[n]; /* array of cache_blk pointers */
-    int blk_index = 0;
-    for (i = 0; i < num_pools && blk_index < n; i++) {
-        while (blk_index < n && (re = pools[i].pop())) {
-            // Remove invalidated entries
-            if (!re->valid) {
-                delete re;
-                continue;
-            }
-            if (iic->clearRef(re->tag_ptr)) {
-                pools[(((i+1)== num_pools)? i :i+1)].push(re, misses);
-            }
-            else {
-                tmp[blk_index] = re->tag_ptr;
-                blk_index++;
-                delete re;
-                repl_pool.sample(i);
-            }
-        }
-    }
-    if (blk_index >= n)
-        return tmp;
-    /* search the fresh pool */
-
-    fatal("No N  replacements found");
-    return NULL;
-}
-
 void
 GenRepl::doAdvance(std::list<unsigned long> &demoted)
 {
diff --git a/src/mem/cache/tags/iic_repl/gen.hh b/src/mem/cache/tags/iic_repl/gen.hh
index cbd15a6fd..2e817d847 100644
--- a/src/mem/cache/tags/iic_repl/gen.hh
+++ b/src/mem/cache/tags/iic_repl/gen.hh
@@ -185,13 +185,6 @@ class GenRepl : public Repl
      */
     virtual unsigned long getRepl();
 
-    /**
-     * Return an array of N tag pointers to replace.
-     * @param n The number of tag pointer to return.
-     * @return An array of tag pointers to replace.
-     */
-    virtual unsigned long *getNRepl(int n);
-
     /**
      * Update replacement data
      */
diff --git a/src/mem/cache/tags/iic_repl/repl.hh b/src/mem/cache/tags/iic_repl/repl.hh
index 51d8169e9..dd25842a0 100644
--- a/src/mem/cache/tags/iic_repl/repl.hh
+++ b/src/mem/cache/tags/iic_repl/repl.hh
@@ -78,13 +78,6 @@ class Repl : public SimObject
      */
     virtual unsigned long getRepl() = 0;
 
-    /**
-     * Return an array of N tag pointers to replace.
-     * @param n The number of tag pointer to return.
-     * @return An array of tag pointers to replace.
-     */
-    virtual unsigned long  *getNRepl(int n) = 0;
-
     /**
      * Update replacement data
      */
-- 
cgit v1.2.3