drc: revive x86 dynarec, support x86-64

[picodrive.git] / platform / linux / emu.c

diff --git a/platform/linux/emu.c b/platform/linux/emu.c
index b99c4a6..c470a77 100644 (file)
--- a/platform/linux/emu.c
+++ b/platform/linux/emu.c
@@ -29,44 +29,9 @@ void pemu_prep_defconfig(void)
 \r
 void pemu_validate_config(void)\r
 {\r
-       extern int PicoOpt;\r
-//     PicoOpt &= ~POPT_EXT_FM;\r
-       PicoOpt &= ~POPT_EN_SVP_DRC;\r
-}\r
-\r
-// FIXME: dupes from GP2X, need cleanup\r
-static void (*osd_text)(int x, int y, const char *text);\r
-\r
-/*\r
-static void osd_text8(int x, int y, const char *text)\r
-{\r
-       int len = strlen(text)*8;\r
-       int *p, i, h, offs;\r
-\r
-       len = (len+3) >> 2;\r
-       for (h = 0; h < 8; h++) {\r
-               offs = (x + g_screen_width * (y+h)) & ~3;\r
-               p = (int *) ((char *)g_screen_ptr + offs);\r
-               for (i = len; i; i--, p++)\r
-                       *p = 0xe0e0e0e0;\r
-       }\r
-       emu_text_out8(x, y, text);\r
-}\r
-*/\r
-\r
-static void osd_text16(int x, int y, const char *text)\r
-{\r
-       int len = strlen(text)*8;\r
-       int *p, i, h, offs;\r
-\r
-       len = (len+1) >> 1;\r
-       for (h = 0; h < 8; h++) {\r
-               offs = (x + g_screen_width * (y+h)) & ~1;\r
-               p = (int *) ((short *)g_screen_ptr + offs);\r
-               for (i = len; i; i--, p++)\r
-                       *p = (*p >> 2) & 0x39e7;\r
-       }\r
-       emu_text_out16(x, y, text);\r
+#if !defined(__arm__) && !defined(__i386__) && !defined(__x86_64__)\r
+       PicoIn.opt &= ~POPT_EN_DRC;\r
+#endif\r
 }\r
 \r
 static void draw_cd_leds(void)\r
@@ -101,10 +66,10 @@ static void draw_cd_leds(void)
 \r
 void pemu_finalize_frame(const char *fps, const char *notice)\r
 {\r
-       if (currentConfig.renderer != RT_16BIT && !(PicoAHW & PAHW_32X)) {\r
+       if (currentConfig.renderer != RT_16BIT && !(PicoIn.AHW & PAHW_32X)) {\r
                unsigned short *pd = (unsigned short *)g_screen_ptr + 8 * g_screen_width;\r
-               unsigned char *ps = PicoDraw2FB + 328*8 + 8;\r
-               unsigned short *pal = HighPal;\r
+               unsigned char *ps = Pico.est.Draw2FB + 328*8 + 8;\r
+               unsigned short *pal = Pico.est.HighPal;\r
                int i, x;\r
                if (Pico.m.dirtyPal)\r
                        PicoDrawUpdateHighPal();\r
@@ -115,11 +80,11 @@ void pemu_finalize_frame(const char *fps, const char *notice)
 \r
        if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) {\r
                if (notice)\r
-                       osd_text(4, g_screen_height - 8, notice);\r
+                       emu_osd_text16(4, g_screen_height - 8, notice);\r
                if (currentConfig.EmuOpt & EOPT_SHOW_FPS)\r
-                       osd_text(g_screen_width - 60, g_screen_height - 8, fps);\r
+                       emu_osd_text16(g_screen_width - 60, g_screen_height - 8, fps);\r
        }\r
-       if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\r
+       if ((PicoIn.AHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))\r
                draw_cd_leds();\r
 }\r
 \r
@@ -127,22 +92,22 @@ static void apply_renderer(void)
 {\r
        switch (currentConfig.renderer) {\r
        case RT_16BIT:\r
-               PicoOpt &= ~POPT_ALT_RENDERER;\r
+               PicoIn.opt &= ~POPT_ALT_RENDERER;\r
                PicoDrawSetOutFormat(PDF_RGB555, 0);\r
                PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
                break;\r
        case RT_8BIT_ACC:\r
-               PicoOpt &= ~POPT_ALT_RENDERER;\r
+               PicoIn.opt &= ~POPT_ALT_RENDERER;\r
                PicoDrawSetOutFormat(PDF_8BIT, 0);\r
-               PicoDrawSetOutBuf(PicoDraw2FB + 8, 328);\r
+               PicoDrawSetOutBuf(Pico.est.Draw2FB + 8, 328);\r
                break;\r
        case RT_8BIT_FAST:\r
-               PicoOpt |=  POPT_ALT_RENDERER;\r
+               PicoIn.opt |=  POPT_ALT_RENDERER;\r
                PicoDrawSetOutFormat(PDF_NONE, 0);\r
                break;\r
        }\r
 \r
-       if (PicoAHW & PAHW_32X)\r
+       if (PicoIn.AHW & PAHW_32X)\r
                PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);\r
 }\r
 \r
@@ -215,7 +180,6 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols)
 void pemu_loop_prep(void)\r
 {\r
        apply_renderer();\r
-       osd_text = osd_text16;\r
 }\r
 \r
 void pemu_loop_end(void)\r
@@ -237,3 +201,7 @@ void plat_wait_till_us(unsigned int us_to)
        }\r
 }\r
 \r
+void *plat_mem_get_for_drc(size_t size)\r
+{\r
+       return NULL;\r
+}\r