Commit fac27ac4 authored by mudlord's avatar mudlord Committed by Libretro-Admin
Browse files

add linking for x86 core. Fixed duplicate definition of bm_GetBlock, almost

links.
parent 197b49c1
......@@ -423,8 +423,9 @@ else
PLATFORM_EXT := win32
CC = gcc
CXX = g++
ifeq ($(WITH_DYNAREC), x86)
LDFLAGS += -m32
endif
CFLAGS += -D TARGET_NO_AREC
endif
......
......@@ -76,16 +76,7 @@ DynarecCodeEntryPtr DYNACALL bm_GetCode(u32 addr)
return (DynarecCodeEntryPtr)FPCA(addr);
}
RuntimeBlockInfo* DYNACALL bm_GetBlock(u32 addr)
{
DynarecCodeEntryPtr cde= (DynarecCodeEntryPtr)FPCA(addr);
if (cde==ngen_FailedToFindBlock)
return 0;
return bm_GetBlock((void*)cde);
}
RuntimeBlockInfo* bm_GetBlock(void* dynarec_code)
RuntimeBlockInfo* bm_GetBlock2(void* dynarec_code)
{
blkmap_t::iterator iter=blkmap.find((RuntimeBlockInfo*)dynarec_code);
if (iter!=blkmap.end())
......@@ -98,6 +89,17 @@ RuntimeBlockInfo* bm_GetBlock(void* dynarec_code)
return 0;
}
RuntimeBlockInfo* DYNACALL bm_GetBlock(u32 addr)
{
DynarecCodeEntryPtr cde= (DynarecCodeEntryPtr)FPCA(addr);
if (cde==ngen_FailedToFindBlock)
return 0;
return bm_GetBlock2((void*)cde);
}
RuntimeBlockInfo* bm_GetStaleBlock(void* dynarec_code)
{
for(u32 i=0;i<del_blocks.size();i++)
......
......@@ -77,10 +77,14 @@ struct CachedBlockInfo: RuntimeBlockInfo_Core
void bm_WriteBlockMap(const string& file);
#ifdef __cplusplus
extern "C" {
#endif
DynarecCodeEntryPtr DYNACALL bm_GetCode(u32 addr);
RuntimeBlockInfo* bm_GetBlock(void* dynarec_code);
RuntimeBlockInfo* bm_GetBlock2(void* dynarec_code);
RuntimeBlockInfo* bm_GetStaleBlock(void* dynarec_code);
RuntimeBlockInfo* DYNACALL bm_GetBlock(u32 addr);
......@@ -93,3 +97,7 @@ void bm_Init();
void bm_Term();
void bm_vmem_pagefill(void** ptr,u32 PAGE_SZ);
#ifdef __cplusplus
}
#endif
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment