Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-04 12:36:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix #3031 - Another ODR violation from @revskills

Browse Source
This commit is contained in:
pancake 2015-08-19 18:58:48 +02:00
parent 64b140fd66
commit f4528faa93
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libr/asm/arch/tms320/c55x_plus/hashtable.c
View File

@ -1,7 +1,7 @@
/* c55plus - LGPL - Copyright 2013 - th0rpe */
#include "ins.h"
#include "hashvector.h"
#include "hashvector.c"
#include <r_types.h>
static const st32 hash_const_01 = 0x2474f685;
@ -12,8 +12,6 @@ static const st32 hash_const_05 = 0;
extern ut8* ins_buff;
extern ut32 ins_buff_len;
extern HASHCODE_ENTRY_T ins_hash[];
st32 get_hashfunc_01(st32 arg1, st32 arg2) {
return arg1;

5
libr/asm/arch/tms320/c55x_plus/hashvector.c
View File

@ -1,4 +1,5 @@
/* c55plus - LGPL - Copyright 2013 - th0rpe */
/* c55plus - LGPL - Copyright 2013-2015 - th0rpe */
/* this .c is included , not compiled */
#include "hashvector.h"
extern st32 get_hashfunc_01(st32 A1, st32 A2);
@ -93,7 +94,7 @@ extern st32 get_hashfunc_89(st32 A1, st32 A2);
extern st32 get_hashfunc_90(st32 A1, st32 A2);
extern st32 get_hashfunc_91(st32 A1, st32 A2);
HASHCODE_ENTRY_T ins_hash[] = {
static HASHCODE_ENTRY_T ins_hash[] = {
{0x223,
get_hashfunc_02},
{0x223,

4
libr/asm/p/tms320.mk
View File

@ -1,13 +1,11 @@
OBJ_TMS320=asm_tms320.o
OBJ_TMS320+=../arch/tms320/tms320_dasm.o
# looks ugly as radare2 build system is terrible
#../arch/tms320/c55x_plus/hashvector.o
OBJ_TMS320+=../arch/tms320/c55x_plus/c55plus.o \
../arch/tms320/c55x_plus/c55plus_decode.o \
../arch/tms320/c55x_plus/decode_funcs.o \
../arch/tms320/c55x_plus/hashtable.o \
../arch/tms320/c55x_plus/hashvector.o \
../arch/tms320/c55x_plus/ins.o \
../arch/tms320/c55x_plus/utils.o