Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tagmap is just a C++ template now. Added iterators to it as

Browse Source 
well. Updated a few outlying uses.
This commit is contained in:
Aaron Giles 2012-01-17 19:06:55 +00:00
parent c8fd0760b8
commit 49f15acb7d
8 changed files with 176 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -1689,7 +1689,6 @@ src/lib/util/pool.c svneol=native#text/plain
src/lib/util/pool.h svneol=native#text/plain src/lib/util/pool.h svneol=native#text/plain
src/lib/util/sha1.c svneol=native#text/plain src/lib/util/sha1.c svneol=native#text/plain
src/lib/util/sha1.h svneol=native#text/plain src/lib/util/sha1.h svneol=native#text/plain
src/lib/util/tagmap.c svneol=native#text/plain
src/lib/util/tagmap.h svneol=native#text/plain src/lib/util/tagmap.h svneol=native#text/plain
src/lib/util/unicode.c svneol=native#text/plain src/lib/util/unicode.c svneol=native#text/plain
src/lib/util/unicode.h svneol=native#text/plain src/lib/util/unicode.h svneol=native#text/plain

13
src/build/makedep.c
View File

@ -95,6 +95,8 @@ struct file_entry
dependency * deplist; dependency * deplist;
}; };
typedef tagmap_t<UINT8> dependency_map;
/*************************************************************************** /***************************************************************************
@ -210,7 +212,7 @@ static int compare_list_entries(const void *p1, const void *p2)
unless we already exist in the map unless we already exist in the map
-------------------------------------------------*/ -------------------------------------------------*/
static void recurse_dependencies(file_entry &file, tagmap_t<astring *> &map) static void recurse_dependencies(file_entry &file, dependency_map &map)
{ {
// skip if we're in an exclude path // skip if we're in an exclude path
int filelen = file.name.len(); int filelen = file.name.len();
@ -220,7 +222,7 @@ static void recurse_dependencies(file_entry &file, tagmap_t<astring *> &map)
return; return;
// attempt to add; if we get an error, we're already present // attempt to add; if we get an error, we're already present
if (map.add(file.name, &file.name) != TMERR_NONE) if (map.add(file.name, 0) != TMERR_NONE)
return; return;
// recurse the list from there // recurse the list from there
@ -304,7 +306,7 @@ static int recurse_dir(int srcrootlen, astring &srcdir)
// make sure we care, first // make sure we care, first
if (core_filename_ends_with(curlist->name, ".c")) if (core_filename_ends_with(curlist->name, ".c"))
{ {
tagmap_t<astring *> depend_map; dependency_map depend_map;
// find dependencies // find dependencies
file_entry &file = compute_dependencies(srcrootlen, srcfile); file_entry &file = compute_dependencies(srcrootlen, srcfile);
@ -317,9 +319,8 @@ static int recurse_dir(int srcrootlen, astring &srcdir)
printf("\n%s : \\\n", target.cstr()); printf("\n%s : \\\n", target.cstr());
// iterate over the hashed dependencies and output them as well // iterate over the hashed dependencies and output them as well
for (int taghash = 0; taghash < TAGMAP_HASH_SIZE; taghash++) for (dependency_map::entry_t *entry = depend_map.first(); entry != NULL; entry = depend_map.next(entry))
for (tagmap_entry *map_entry = depend_map.table[taghash]; map_entry != NULL; map_entry = map_entry->next) printf("\t%s \\\n", entry->tag().cstr());
printf("\t%s \\\n", ((astring *)map_entry->object)->cstr());
} }
} }

3
src/emu/emualloc.h
View File

@ -331,9 +331,6 @@ extern const zeromem_t zeromem;
#define calloc(x,y) __error_use_auto_alloc_clear_or_global_alloc_clear_instead__ #define calloc(x,y) __error_use_auto_alloc_clear_or_global_alloc_clear_instead__
#define realloc(x,y) __error_realloc_is_dangerous__ #define realloc(x,y) __error_realloc_is_dangerous__
#define free(x) free_file_line(x, __FILE__, __LINE__) #define free(x) free_file_line(x, __FILE__, __LINE__)
// disable direct deletion
#define delete __error_use_pool_free_mechanisms__
#endif #endif
#endif /* __EMUALLOC_H__ */ #endif /* __EMUALLOC_H__ */

2
src/emu/sound/discrete.c
View File

@ -541,7 +541,7 @@ void discrete_device::discrete_build_list(const discrete_block *intf, sound_bloc
} }
} }
for_each (int *, i, &deletethem) for_each (int *, i, &deletethem)
block_list.delete(*i); block_list.remove(*i);
} }
else else
{ {

2
src/emu/sound/discrete.h
View File

@ -3810,7 +3810,7 @@ public:
m_count++; m_count++;
return &m_arr[m_count-1]; return &m_arr[m_count-1];
} }
inline void delete(int index) inline void remove(int index)
{ {
for (int i=index+1; i < m_count; i++) for (int i=index+1; i < m_count; i++)
m_arr[i-1] = m_arr[i]; m_arr[i-1] = m_arr[i];

1
src/lib/lib.mak
View File

@ -48,7 +48,6 @@ UTILOBJS = \
$(LIBOBJ)/util/png.o \ $(LIBOBJ)/util/png.o \
$(LIBOBJ)/util/pool.o \ $(LIBOBJ)/util/pool.o \
$(LIBOBJ)/util/sha1.o \ $(LIBOBJ)/util/sha1.o \
$(LIBOBJ)/util/tagmap.o \
$(LIBOBJ)/util/unicode.o \ $(LIBOBJ)/util/unicode.o \
$(LIBOBJ)/util/unzip.o \ $(LIBOBJ)/util/unzip.o \
$(LIBOBJ)/util/vbiparse.o \ $(LIBOBJ)/util/vbiparse.o \

218
src/lib/util/tagmap.c
View File

@ -1,218 +0,0 @@
/***************************************************************************
tagmap.c
Simple tag->object mapping functions.
****************************************************************************
Copyright Aaron Giles
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
* Neither the name 'MAME' nor the names of its contributors may be
used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY AARON GILES ''AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL AARON GILES BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
****************************************************************************/
#include "tagmap.h"
#include <stdlib.h>
/***************************************************************************
FUNCTION PROTOTYPES
***************************************************************************/
static tagmap_error tagmap_add_common(tagmap *map, const char *tag, void *object, UINT8 replace_if_duplicate, UINT8 unique_hash);
/***************************************************************************
MAP ALLOCATION AND MANAGEMENT
***************************************************************************/
/*-------------------------------------------------
tagmap_alloc - allocate a new tagmap
-------------------------------------------------*/
tagmap *tagmap_alloc(void)
{
tagmap *map = (tagmap *)malloc(sizeof(*map));
if (map != NULL)
memset(map, 0, sizeof(*map));
return map;
}
/*-------------------------------------------------
tagmap_free - free a tagmap, and all
entries within it
-------------------------------------------------*/
void tagmap_free(tagmap *map)
{
tagmap_reset(map);
free(map);
}
/*-------------------------------------------------
tagmap_reset - reset a tagmap by freeing
all entries
-------------------------------------------------*/
void tagmap_reset(tagmap *map)
{
UINT32 hashindex;
for (hashindex = 0; hashindex < ARRAY_LENGTH(map->table); hashindex++)
{
tagmap_entry *entry, *next;
for (entry = map->table[hashindex]; entry != NULL; entry = next)
{
next = entry->next;
free(entry);
}
map->table[hashindex] = NULL;
}
}
/***************************************************************************
MAP ALLOCATION AND MANAGEMENT
***************************************************************************/
/*-------------------------------------------------
tagmap_add - add a new object to the
tagmap
-------------------------------------------------*/
tagmap_error tagmap_add(tagmap *map, const char *tag, void *object, UINT8 replace_if_duplicate)
{
return tagmap_add_common(map, tag, object, replace_if_duplicate, FALSE);
}
/*-------------------------------------------------
tagmap_add_unique_hash - add a new entry to a
tagmap, ensuring it has a unique hash value
-------------------------------------------------*/
tagmap_error tagmap_add_unique_hash(tagmap *map, const char *tag, void *object, UINT8 replace_if_duplicate)
{
return tagmap_add_common(map, tag, object, replace_if_duplicate, TRUE);
}
/*-------------------------------------------------
tagmap_remove - remove an entr from a
tagmap
-------------------------------------------------*/
void tagmap_remove(tagmap *map, const char *tag)
{
UINT32 fullhash = tagmap_hash(tag);
tagmap_entry **entryptr;
for (entryptr = &map->table[fullhash % ARRAY_LENGTH(map->table)]; *entryptr != NULL; entryptr = &(*entryptr)->next)
if ((*entryptr)->fullhash == fullhash && strcmp((*entryptr)->tag, tag) == 0)
{
tagmap_entry *entry = *entryptr;
*entryptr = entry->next;
free(entry);
break;
}
}
/*-------------------------------------------------
tagmap_remove_object - remove an entry from a
tagmap by object pointer
-------------------------------------------------*/
void tagmap_remove_object(tagmap *map, void *object)
{
UINT32 hashindex;
for (hashindex = 0; hashindex < ARRAY_LENGTH(map->table); hashindex++)
{
tagmap_entry **entryptr;
for (entryptr = &map->table[hashindex]; *entryptr != NULL; entryptr = &(*entryptr)->next)
if ((*entryptr)->object == object)
{
tagmap_entry *entry = *entryptr;
*entryptr = entry->next;
free(entry);
return;
}
}
}
/***************************************************************************
LOCAL FUNCTIONS
***************************************************************************/
/*-------------------------------------------------
tagmap_add_common - core implementation of
a tagmap addition
-------------------------------------------------*/
static tagmap_error tagmap_add_common(tagmap *map, const char *tag, void *object, UINT8 replace_if_duplicate, UINT8 unique_hash)
{
UINT32 fullhash = tagmap_hash(tag);
UINT32 hashindex = fullhash % ARRAY_LENGTH(map->table);
tagmap_entry *entry;
/* first make sure we don't have a duplicate */
for (entry = map->table[hashindex]; entry != NULL; entry = entry->next)
if (entry->fullhash == fullhash)
if (unique_hash || strcmp(tag, entry->tag) == 0)
{
if (replace_if_duplicate)
entry->object = object;
return TMERR_DUPLICATE;
}
/* now allocate a new entry */
entry = (tagmap_entry *)malloc(sizeof(*entry) + strlen(tag));
if (entry == NULL)
return TMERR_OUT_OF_MEMORY;
/* fill in the entry */
entry->object = object;
entry->fullhash = fullhash;
strcpy(entry->tag, tag);
/* add it to the head of the list */
entry->next = map->table[hashindex];
map->table[hashindex] = entry;
return TMERR_NONE;
}

313
src/lib/util/tagmap.h
View File

@ -43,181 +43,202 @@
#define __TAGMAP_H__ #define __TAGMAP_H__
#include "osdcore.h" #include "osdcore.h"
#include "astring.h"
/*************************************************************************** //**************************************************************************
CONSTANTS // CONSTANTS
***************************************************************************/ //**************************************************************************
#define TAGMAP_HASH_SIZE 97 enum tagmap_error
enum _tagmap_error
{ {
TMERR_NONE, TMERR_NONE,
TMERR_OUT_OF_MEMORY,
TMERR_DUPLICATE TMERR_DUPLICATE
}; };
typedef enum _tagmap_error tagmap_error;
/*************************************************************************** //**************************************************************************
TYPE DEFINITIONS // TYPE DEFINITIONS
***************************************************************************/ //**************************************************************************
/* an entry in a tagmap */ // generally used for small tables, though the hash size can be increased
typedef struct _tagmap_entry tagmap_entry; // as necessary; good primes are: 53, 97, 193, 389, 769, 1543, 3079, 6151, etc
struct _tagmap_entry template<class _ElementType, int _HashSize = 53>
{ class tagmap_t
tagmap_entry * next;
void * object;
UINT32 fullhash;
char tag[1];
};
/* base tagmap structure */
typedef struct _tagmap tagmap;
struct _tagmap
{
tagmap_entry * table[TAGMAP_HASH_SIZE];
};
/***************************************************************************
FUNCTION PROTOTYPES
***************************************************************************/
/* ----- map allocation and management ----- */
/* allocate a new tagmap */
tagmap *tagmap_alloc(void);
/* free a tagmap, and all entries within it */
void tagmap_free(tagmap *map);
/* reset a tagmap by freeing all entries */
void tagmap_reset(tagmap *map);
/* ----- object management ----- */
/* add a new entry to a tagmap */
tagmap_error tagmap_add(tagmap *map, const char *tag, void *object, UINT8 replace_if_duplicate);
/* add a new entry to a tagmap, ensuring it has a unique hash value */
tagmap_error tagmap_add_unique_hash(tagmap *map, const char *tag, void *object, UINT8 replace_if_duplicate);
/* remove an entry from a tagmap */
void tagmap_remove(tagmap *map, const char *tag);
/* remove an entry from a tagmap by object pointer */
void tagmap_remove_object(tagmap *map, void *object);
/***************************************************************************
C++ WRAPPERS
***************************************************************************/
#ifdef __cplusplus
/* derived class for C++ */
template<class _ElementType> class tagmap_t : public tagmap
{ {
private: private:
tagmap_t(const tagmap &); // disable copying/assignment
tagmap_t &operator=(const tagmap &); tagmap_t(const tagmap_t &);
tagmap_t &operator=(const tagmap_t &);
public: public:
tagmap_t() { memset(table, 0, sizeof(table)); } // an entry in the table
class entry_t
{
friend class tagmap_t<_ElementType, _HashSize>;
public:
// construction/destruction
entry_t(const char *tag, UINT32 fullhash, _ElementType object)
: m_next(NULL),
m_fullhash(fullhash),
m_tag(tag),
m_object(object) { }
// accessors
const astring &tag() const { return m_tag; }
_ElementType object() const { return m_object; }
// setters
void set_object(_ElementType object) { m_object = object; }
private:
// internal helpers
entry_t *next() const { return m_next; }
UINT32 fullhash() const { return m_fullhash; }
// internal state
entry_t * m_next;
UINT32 m_fullhash;
astring m_tag;
_ElementType m_object;
};
// construction/destruction
tagmap_t() { memset(m_table, 0, sizeof(m_table)); }
~tagmap_t() { reset(); } ~tagmap_t() { reset(); }
void reset() { tagmap_reset(this); } // core hashing function
UINT32 hash(const char *string) const
{
UINT32 result = *string++;
for (char c = *string++; c != 0; c = *string++)
result = ((result << 5) | (result >> 27)) + c;
return result;
}
tagmap_error add(const char *tag, _ElementType object, bool replace_if_duplicate = false) { return tagmap_add(this, tag, (void *)object, replace_if_duplicate); } // empty the list
tagmap_error add_unique_hash(const char *tag, _ElementType object, bool replace_if_duplicate = false) { return tagmap_add_unique_hash(this, tag, (void *)object, replace_if_duplicate); } void reset()
void remove(const char *tag) { tagmap_remove(this, tag); } {
void remove(_ElementType object) { tagmap_remove_object(this, object); } for (UINT32 hashindex = 0; hashindex < ARRAY_LENGTH(m_table); hashindex++)
while (m_table[hashindex] != NULL)
remove_common(&m_table[hashindex]);
}
_ElementType find(const char *tag) const { return reinterpret_cast<_ElementType>(tagmap_find(this, tag)); } // add/remove
_ElementType find(const char *tag, UINT32 hash) const { return reinterpret_cast<_ElementType>(tagmap_find_prehashed(this, tag, hash)); } tagmap_error add(const char *tag, _ElementType object, bool replace_if_duplicate = false) { return add_common(tag, object, replace_if_duplicate, false); }
_ElementType find_hash_only(const char *tag) const { return reinterpret_cast<_ElementType>(tagmap_find_hash_only(this, tag)); } tagmap_error add_unique_hash(const char *tag, _ElementType object, bool replace_if_duplicate = false) { return add_common(tag, object, replace_if_duplicate, true); }
// remove by tag
void remove(const char *tag)
{
UINT32 fullhash = hash(tag);
for (entry_t **entryptr = &m_table[fullhash % ARRAY_LENGTH(m_table)]; *entryptr != NULL; entryptr = &(*entryptr)->m_next)
if ((*entryptr)->fullhash() == fullhash && (*entryptr)->tag() == tag)
return remove_common(entryptr);
}
// remove by object
void remove(_ElementType object)
{
for (UINT32 hashindex = 0; hashindex < ARRAY_LENGTH(m_table); hashindex++)
for (entry_t **entryptr = &m_table[hashindex]; *entryptr != NULL; entryptr = &(*entryptr)->m_next)
if ((*entryptr)->object() == object)
return remove_common(entryptr);
}
// find by tag
_ElementType find(const char *tag) const { return find(tag, hash(tag)); }
// find by tag with precomputed hash
_ElementType find(const char *tag, UINT32 fullhash) const
{
for (entry_t *entry = m_table[fullhash % ARRAY_LENGTH(m_table)]; entry != NULL; entry = entry->next())
if (entry->fullhash() == fullhash && entry->tag() == tag)
return entry->object();
return NULL;
}
// find by tag without checking anything but the hash
_ElementType find_hash_only(const char *tag) const
{
UINT32 fullhash = hash(tag);
for (entry_t *entry = m_table[fullhash % ARRAY_LENGTH(m_table)]; entry != NULL; entry = entry->next())
if (entry->fullhash() == fullhash)
return entry->object();
return NULL;
}
// return first object in the table
entry_t *first() const { return next(NULL); }
// return next object in the table
entry_t *next(entry_t *after) const
{
// if there's another item in this hash bucket, just return it
if (after != NULL && after->next() != NULL)
return after->next();
// otherwise scan forward for the next bucket with an entry
UINT32 firstindex = (after != NULL) ? (after->fullhash() % ARRAY_LENGTH(m_table) + 1) : 0;
for (UINT32 hashindex = firstindex; hashindex < ARRAY_LENGTH(m_table); hashindex++)
if (m_table[hashindex] != NULL)
return m_table[hashindex];
// all out
return NULL;
}
private:
// internal helpers
tagmap_error add_common(const char *tag, _ElementType object, bool replace_if_duplicate, bool unique_hash);
// remove an entry given a pointer to its pointer
void remove_common(entry_t **entryptr)
{
entry_t *entry = *entryptr;
*entryptr = entry->next();
delete entry;
}
// internal state
entry_t * m_table[_HashSize];
}; };
#endif
//**************************************************************************
// IMPLEMENTATION
//**************************************************************************
/*************************************************************************** //-------------------------------------------------
INLINE FUNCTIONS // add_common - core implementation of a tagmap
***************************************************************************/ // addition
//-------------------------------------------------
/*------------------------------------------------- template<class _ElementType, int _HashSize>
tagmap_hash - compute the hash of a tag tagmap_error tagmap_t<_ElementType, _HashSize>::add_common(const char *tag, _ElementType object, bool replace_if_duplicate, bool unique_hash)
-------------------------------------------------*/
INLINE UINT32 tagmap_hash(const char *string)
{ {
UINT32 hash = *string++; UINT32 fullhash = hash(tag);
char c; UINT32 hashindex = fullhash % ARRAY_LENGTH(m_table);
while ((c = *string++) != 0) // first make sure we don't have a duplicate
hash = ((hash << 5) | (hash >> 27)) + c; for (entry_t *entry = m_table[hashindex]; entry != NULL; entry = entry->next())
if (entry->fullhash() == fullhash)
if (unique_hash || entry->tag() == tag)
{
if (replace_if_duplicate)
entry->set_object(object);
return TMERR_DUPLICATE;
}
return hash; // now allocate a new entry and add to the head of the list
} entry_t *entry = new entry_t(tag, fullhash, object);
entry->m_next = m_table[hashindex];
m_table[hashindex] = entry;
/*------------------------------------------------- return TMERR_NONE;
tagmap_find_prehashed - find an object
associated with a tag, given the tag's
hash
-------------------------------------------------*/
INLINE void *tagmap_find_prehashed(const tagmap *map, const char *tag, UINT32 fullhash)
{
tagmap_entry *entry;
for (entry = map->table[fullhash % ARRAY_LENGTH(map->table)]; entry != NULL; entry = entry->next)
if (entry->fullhash == fullhash && strcmp(entry->tag, tag) == 0)
return entry->object;
return NULL;
}
/*-------------------------------------------------
tagmap_find - find an object associated
with a tag
-------------------------------------------------*/
INLINE void *tagmap_find(const tagmap *map, const char *tag)
{
return tagmap_find_prehashed(map, tag, tagmap_hash(tag));
}
/*-------------------------------------------------
tagmap_find_hash_only - find an object
associated with a tag using only the hash;
this generally works well but may occasionally
return a false positive
-------------------------------------------------*/
INLINE void *tagmap_find_hash_only(const tagmap *map, const char *tag)
{
UINT32 fullhash = tagmap_hash(tag);
tagmap_entry *entry;
for (entry = map->table[fullhash % ARRAY_LENGTH(map->table)]; entry != NULL; entry = entry->next)
if (entry->fullhash == fullhash)
return entry->object;
return NULL;
} }