#2257: added global memcpy/memset undef · alice.mosphere.at/TIC-80@be9879e

+8

include/tic80_types.h

··· 24 24 25 25 #include <stdint.h> 26 26 #include <stdbool.h> 27 + #include <string.h> 28 + 29 + #ifdef memcpy 30 + #undef memcpy 31 + #endif 32 + #ifdef memset 33 + #undef memset 34 + #endif 27 35 28 36 typedef uint8_t u8; 29 37 typedef uint16_t u16;

-2

src/api/janet.c

··· 646 646 s32 size = janet_getinteger(argv, 2); 647 647 648 648 tic_core* core = getJanetMachine(); tic_mem* tic = (tic_mem*)core; 649 - #undef memcpy 650 649 core->api.memcpy(tic, dst, src, size); 651 650 return janet_wrap_nil(); 652 651 } ··· 661 660 662 661 tic_core* core = getJanetMachine(); tic_mem* tic = (tic_mem*)core; 663 662 664 - #undef memset 665 663 core->api.memset(tic, dst, val, size); 666 664 return janet_wrap_nil(); 667 665 }

-2

src/api/js.c

··· 595 595 s32 size = getInteger(ctx, argv[2]); 596 596 597 597 tic_core* core = getCore(ctx); tic_mem* tic = (tic_mem*)core; 598 - #undef memcpy 599 598 core->api.memcpy(tic, dest, src, size); 600 599 601 600 return JS_UNDEFINED; ··· 609 608 610 609 tic_core* core = getCore(ctx); tic_mem* tic = (tic_mem*)core; 611 610 612 - #undef memset 613 611 core->api.memset(tic, dest, value, size); 614 612 615 613 return JS_UNDEFINED;

-3

src/api/lua.c

··· 23 23 #include "core/core.h" 24 24 25 25 #include <stdlib.h> 26 - #include <string.h> 27 26 #include <lua.h> 28 27 #include <lauxlib.h> 29 28 #include <lualib.h> ··· 1201 1200 1202 1201 tic_core* core = getLuaCore(lua); 1203 1202 tic_mem* tic = (tic_mem*)core; 1204 - #undef memcpy 1205 1203 core->api.memcpy(tic, dest, src, size); 1206 1204 } 1207 1205 else luaL_error(lua, "invalid params, memcpy(dest,src,size)\n"); ··· 1222 1220 tic_core* core = getLuaCore(lua); 1223 1221 tic_mem* tic = (tic_mem*)core; 1224 1222 1225 - #undef memset 1226 1223 core->api.memset(tic, dest, value, size); 1227 1224 } 1228 1225 else luaL_error(lua, "invalid params, memset(dest,val,size)\n");

-2

src/api/mruby.c

··· 808 808 if(size >= 0 && size <= sizeof(tic_ram) && dest >= 0 && src >= 0 && dest <= bound && src <= bound) 809 809 { 810 810 tic_core* core = getMRubyMachine(mrb); tic_mem* tic = (tic_mem*)core; 811 - #undef memcpy 812 811 core->api.memcpy(tic, dest, src, size); 813 812 } 814 813 else ··· 830 829 { 831 830 tic_core* core = getMRubyMachine(mrb); tic_mem* tic = (tic_mem*)core; 832 831 833 - #undef memset 834 832 core->api.memset(tic, dest, value, size); 835 833 } 836 834 else

-2

src/api/python.c

··· 481 481 if(pkpy_check_error(vm)) 482 482 return 0; 483 483 484 - #undef memcpy 485 484 core->api.memcpy(tic, dest, src, size); 486 485 487 486 return 0; ··· 501 500 if(pkpy_check_error(vm)) 502 501 return 0; 503 502 504 - #undef memset 505 503 core->api.memset(tic, dest, value, size); 506 504 507 505 return 0;

-2

src/api/scheme.c

··· 425 425 const s32 source = s7_integer(s7_cadr(args)); 426 426 const s32 size = s7_integer(s7_caddr(args)); 427 427 428 - #undef memcpy 429 428 core->api.memcpy(tic, dest, source, size); 430 429 return s7_nil(sc); 431 430 } ··· 437 436 const s32 value = s7_integer(s7_cadr(args)); 438 437 const s32 size = s7_integer(s7_caddr(args)); 439 438 440 - #undef memset 441 439 core->api.memset(tic, dest, value, size); 442 440 return s7_nil(sc); 443 441 }

-2

src/api/squirrel.c

··· 1177 1177 1178 1178 tic_core* core = getSquirrelCore(vm); tic_mem* tic = (tic_mem*)core; 1179 1179 1180 - #undef memcpy 1181 1180 core->api.memcpy(tic, dest, src, size); 1182 1181 return 0; 1183 1182 } ··· 1197 1196 1198 1197 tic_core* core = getSquirrelCore(vm); tic_mem* tic = (tic_mem*)core; 1199 1198 1200 - #undef memset 1201 1199 core->api.memset(tic, dest, value, size); 1202 1200 return 0; 1203 1201 }

-2

src/api/wasm.c

··· 848 848 849 849 tic_core* core = getWasmCore(runtime); tic_mem* tic = (tic_mem*)core; 850 850 851 - #undef memset 852 851 core->api.memset(tic, address, value, length); 853 852 854 853 m3ApiSuccess(); ··· 862 861 863 862 tic_core* core = getWasmCore(runtime); tic_mem* tic = (tic_mem*)core; 864 863 865 - #undef memcpy 866 864 core->api.memcpy(tic, dest, src, length); 867 865 868 866 m3ApiSuccess();

-2

src/api/wren.c

··· 1151 1151 1152 1152 tic_core* core = getWrenCore(vm); tic_mem* tic = (tic_mem*)core; 1153 1153 1154 - #undef memcpy 1155 1154 core->api.memcpy(tic, dest, src, size); 1156 1155 } 1157 1156 ··· 1163 1162 1164 1163 tic_core* core = getWrenCore(vm); tic_mem* tic = (tic_mem*)core; 1165 1164 1166 - #undef memset 1167 1165 core->api.memset(tic, dest, value, size); 1168 1166 } 1169 1167

Configure Feed

Configure Feed