From d73ec9b645caa273a04c69b5ef1c62a9ae67847a Mon Sep 17 00:00:00 2001 From: Themaister Date: Sun, 25 Mar 2012 23:29:39 +0200 Subject: [PATCH] Move hashing code to hash.o. --- Makefile | 4 +-- Makefile.win | 4 +-- cheats.c | 2 +- file.c | 5 +--- sha256.c => hash.c | 64 ++++++++++++++++++++++++++++++++++++++- sha256.h => hash.h | 20 +++++++++++-- movie.c | 74 +--------------------------------------------- movie.h | 3 -- patch.c | 2 +- 9 files changed, 89 insertions(+), 89 deletions(-) rename sha256.c => hash.c (60%) rename sha256.h => hash.h (70%) diff --git a/Makefile b/Makefile index f07ab3454c..825aeafb7f 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ include config.mk TARGET = ssnes tools/ssnes-joyconfig -OBJ = ssnes.o file.o driver.o settings.o dynamic.o message.o rewind.o movie.o gfx/gfx_common.o patch.o compat/compat.o screenshot.o audio/utils.o +OBJ = ssnes.o file.o hash.o driver.o settings.o dynamic.o message.o rewind.o movie.o gfx/gfx_common.o patch.o compat/compat.o screenshot.o audio/utils.o JOYCONFIG_OBJ = tools/ssnes-joyconfig.o conf/config_file.o compat/compat.o HEADERS = $(wildcard */*.h) $(wildcard *.h) @@ -122,7 +122,7 @@ ifeq ($(HAVE_CG), 1) endif ifeq ($(HAVE_XML), 1) - OBJ += sha256.o cheats.o + OBJ += cheats.o LIBS += $(XML_LIBS) DEFINES += $(XML_CFLAGS) diff --git a/Makefile.win b/Makefile.win index 2ba598424b..1a9bb5acb8 100644 --- a/Makefile.win +++ b/Makefile.win @@ -1,6 +1,6 @@ TARGET = ssnes.exe JTARGET = ssnes-joyconfig.exe -OBJ = ssnes.o file.o driver.o conf/config_file.o settings.o dynamic.o message.o rewind.o movie.o gfx/gfx_common.o patch.o compat/compat.o screenshot.o audio/utils.o +OBJ = ssnes.o file.o driver.o conf/config_file.o settings.o hash.o dynamic.o message.o rewind.o movie.o gfx/gfx_common.o patch.o compat/compat.o screenshot.o audio/utils.o JOBJ = conf/config_file.o tools/ssnes-joyconfig.o compat/compat.o CC = gcc @@ -84,7 +84,7 @@ ifeq ($(HAVE_RSOUND), 1) endif ifeq ($(HAVE_XML), 1) - OBJ += gfx/shader_glsl.o gfx/image.o gfx/snes_state.o sha256.o cheats.o + OBJ += gfx/shader_glsl.o gfx/image.o gfx/snes_state.o cheats.o DEFINES += -Ilibxml2 -DHAVE_XML LIBS += -lxml2 -liconv endif diff --git a/cheats.c b/cheats.c index 3c465ccc04..5fba50c7c9 100644 --- a/cheats.c +++ b/cheats.c @@ -16,7 +16,7 @@ */ #include "cheats.h" -#include "sha256.h" +#include "hash.h" #include "dynamic.h" #include "general.h" #include "compat/strl.h" diff --git a/file.c b/file.c index dc72f50af2..e2a8773ff3 100644 --- a/file.c +++ b/file.c @@ -26,10 +26,7 @@ #include "movie.h" #include "patch.h" #include "compat/strl.h" - -#ifdef HAVE_XML -#include "sha256.h" -#endif +#include "hash.h" #ifdef __CELLOS_LV2__ #include diff --git a/sha256.c b/hash.c similarity index 60% rename from sha256.c rename to hash.c index 58a5b680a0..74fba20ca7 100644 --- a/sha256.c +++ b/hash.c @@ -19,7 +19,7 @@ // #include "general.h" -#include "sha256.h" +#include "hash.h" #include #include @@ -195,3 +195,65 @@ void sha256_hash(char *out, const uint8_t *in, size_t size) snprintf(out + 2 * i, 3, "%02x", (unsigned)shahash.u8[i]); } +#ifndef HAVE_ZLIB +// Zlib crc32. +static const uint32_t crc32_table[256] = { + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, + 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, + 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, + 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, + 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, + 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, + 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, + 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, + 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, + 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, + 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, + 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, + 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, + 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, + 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, + 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, + 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, + 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, + 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, + 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, + 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, + 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, + 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, + 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, + 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, + 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, + 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, + 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, + 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, + 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, + 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, + 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, + 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, + 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, + 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, + 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, + 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, + 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, + 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, + 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d +}; + +uint32_t crc32_adjust(uint32_t crc32, uint8_t input) +{ + return ((crc32 >> 8) & 0x00ffffff) ^ crc32_table[(crc32 ^ input) & 0xff]; +} + +uint32_t crc32_calculate(const uint8_t *data, size_t length) +{ + uint32_t crc32 = ~0; + for (size_t i = 0; i < length; i++) + crc32 = crc32_adjust(crc32, data[i]); + return ~crc32; +} +#endif + diff --git a/sha256.h b/hash.h similarity index 70% rename from sha256.h rename to hash.h index 9a5c55f35c..87760fd3ad 100644 --- a/sha256.h +++ b/hash.h @@ -15,8 +15,8 @@ * If not, see . */ -#ifndef __SSNES_SHA256_H -#define __SSNES_SHA256_H +#ifndef __SSNES_HASH_H +#define __SSNES_HASH_H #include #include @@ -24,5 +24,21 @@ // Hashes sha256 and outputs a human readable string for comparing with the cheat XML values. void sha256_hash(char *out, const uint8_t *in, size_t size); +#ifdef HAVE_ZLIB +#include "console/szlib/zlib.h" +static inline uint32_t crc32_calculate(const uint8_t *data, size_t length) +{ + return crc32(0, data, length); +} + +static inline uint32_t crc32_adjust(uint32_t crc, uint8_t data) +{ + return crc32(crc, &data, 1); +} +#else +uint32_t crc32_calculate(const uint8_t *data, size_t length); +uint32_t crc32_adjust(uint32_t crc, uint8_t data); +#endif + #endif diff --git a/movie.c b/movie.c index 0948a06e12..0ca2e69829 100644 --- a/movie.c +++ b/movie.c @@ -16,85 +16,13 @@ */ #include "movie.h" +#include "hash.h" #include #include #include #include "general.h" #include "dynamic.h" -#ifdef HAVE_ZLIB -#include "console/szlib/zlib.h" -uint32_t crc32_calculate(const uint8_t *data, size_t length) -{ - return crc32(0, data, length); -} - -uint32_t crc32_adjust(uint32_t crc, uint8_t data) -{ - return crc32(crc, &data, 1); -} -#else -// Zlib crc32. -static const uint32_t crc32_table[256] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; - -uint32_t crc32_adjust(uint32_t crc32, uint8_t input) -{ - return ((crc32 >> 8) & 0x00ffffff) ^ crc32_table[(crc32 ^ input) & 0xff]; -} - -uint32_t crc32_calculate(const uint8_t *data, size_t length) -{ - uint32_t crc32 = ~0; - for (size_t i = 0; i < length; i++) - crc32 = crc32_adjust(crc32, data[i]); - return ~crc32; -} -#endif - struct bsv_movie { FILE *file; diff --git a/movie.h b/movie.h index efd86c4eee..6ac5287769 100644 --- a/movie.h +++ b/movie.h @@ -48,8 +48,5 @@ void bsv_movie_frame_rewind(bsv_movie_t *handle); void bsv_movie_free(bsv_movie_t *handle); -uint32_t crc32_calculate(const uint8_t *data, size_t length); -uint32_t crc32_adjust(uint32_t crc, uint8_t data); - #endif diff --git a/patch.c b/patch.c index 78d639ff2e..96bec2289e 100644 --- a/patch.c +++ b/patch.c @@ -19,7 +19,7 @@ // Modified for SSNES. #include "patch.h" -#include "movie.h" +#include "hash.h" #include "boolean.h" #include "msvc/msvc_compat.h" #include