# HG changeset patch # User Matti Hamalainen # Date 1529308399 -10800 # Node ID 160b2c9cdee3967b3d807fb6c8351cab2eb1741a # Parent 7df833754fd1fdca9bab44bf165553158c29df3b Use DO_SET_MEM_LO instead of DO_SET_MEM for some things. diff -r 7df833754fd1 -r 160b2c9cdee3 tools/lib64fmts.c --- a/tools/lib64fmts.c Thu Jun 14 15:51:48 2018 +0300 +++ b/tools/lib64fmts.c Mon Jun 18 10:53:19 2018 +0300 @@ -942,7 +942,7 @@ { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, NULL, NULL }, { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, NULL, NULL }, { DO_COPY , DS_COLOR_RAM , 0x2328, 0, 0, NULL, NULL }, - { DO_SET_MEM , DS_BGCOL , 0x2710, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_BGCOL , 0x2710, 0, 0, NULL, NULL }, { DO_LAST , 0 , 0 , 0, 0, NULL, NULL }, } }, @@ -1004,7 +1004,7 @@ { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, NULL, NULL }, { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, NULL, NULL }, { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, NULL, NULL }, - { DO_SET_MEM , DS_BGCOL , 0x2740, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_BGCOL , 0x2740, 0, 0, NULL, NULL }, { DO_LAST , 0 , 0 , 0, 0, NULL, NULL }, } }, @@ -1019,7 +1019,7 @@ { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, NULL, NULL }, { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, NULL, NULL }, { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, NULL, NULL }, - { DO_SET_MEM , DS_BGCOL , 0x2740, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_BGCOL , 0x2740, 0, 0, NULL, NULL }, { DO_COPY , DS_BITMAP_RAM , 0x2800, 1, 0, NULL, NULL }, { DO_DEC_FUNC , 0 , 0x2742, 0, 1, fmtDrazLaceGetLaceType, NULL }, { DO_ENC_FUNC , 0 , 0x2742, 0, 1, NULL, fmtDrazLaceSetLaceType }, @@ -1035,7 +1035,7 @@ fmtGetPixelTruePaint, { { DO_COPY , DS_SCREEN_RAM , 0x0000, 0, 0, NULL, NULL }, - { DO_SET_MEM , DS_BGCOL , 0x03e8, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_BGCOL , 0x03e8, 0, 0, NULL, NULL }, { DO_COPY , DS_BITMAP_RAM , 0x0400, 0, 0, NULL, NULL }, { DO_COPY , DS_BITMAP_RAM , 0x2400, 1, 0, NULL, NULL }, { DO_COPY , DS_SCREEN_RAM , 0x4400, 1, 0, NULL, NULL }, @@ -1128,7 +1128,7 @@ NULL, { { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, NULL, NULL }, - { DO_SET_MEM , DS_BGCOL , 0x07e8, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_BGCOL , 0x07e8, 0, 0, NULL, NULL }, { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, NULL, NULL }, { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, NULL, NULL }, { DO_LAST , 0 , 0 , 0, 0, NULL, NULL }, @@ -1149,7 +1149,7 @@ NULL, { { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, NULL, NULL }, - { DO_SET_MEM , DS_BGCOL , 0x07fe, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_BGCOL , 0x07fe, 0, 0, NULL, NULL }, { DO_COPY , DS_BITMAP_RAM , 0x0800, 0, 0, NULL, NULL }, { DO_COPY , DS_SCREEN_RAM , 0x0400, 0, 0, NULL, NULL }, { DO_LAST , 0 , 0 , 0, 0, NULL, NULL }, @@ -1199,7 +1199,8 @@ { { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, NULL, NULL }, { DO_COPY , DS_SCREEN_RAM , 0x1f40, 0, 0, NULL, NULL }, - { DO_SET_MEM , DS_BGCOL , 0x2329, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_D020 , 0x2328, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_BGCOL , 0x2329, 0, 0, NULL, NULL }, { DO_COPY , DS_COLOR_RAM , 0x2338, 0, 0, NULL, NULL }, { DO_LAST , 0 , 0 , 0, 0, NULL, NULL }, }, @@ -1220,7 +1221,7 @@ { { DO_COPY , DS_COLOR_RAM , 0x0000, 0, 0, NULL, NULL }, { DO_COPY , DS_BITMAP_RAM , 0x0400, 0, 0, NULL, NULL }, - { DO_SET_MEM , DS_BGCOL , 0x23ff, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_BGCOL , 0x23ff, 0, 0, NULL, NULL }, { DO_COPY , DS_SCREEN_RAM , 0x2400, 0, 0, NULL, NULL }, { DO_LAST , 0 , 0 , 0, 0, NULL, NULL }, } @@ -1265,7 +1266,7 @@ { DO_COPY , DS_BITMAP_RAM , 0x0000 + 0x111, 0, 0, NULL, NULL }, { DO_COPY , DS_SCREEN_RAM , 0x1f40 + 0x111, 0, 0, NULL, NULL }, { DO_COPY , DS_COLOR_RAM , 0x2328 + 0x111, 0, 0, NULL, NULL }, - { DO_SET_MEM , DS_BGCOL , 0x2710 + 0x111, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_BGCOL , 0x2710 + 0x111, 0, 0, NULL, NULL }, { DO_LAST , 0 , 0 , 0, 0, NULL, NULL }, } }, @@ -1306,7 +1307,7 @@ NULL, { { DO_COPY , DS_SCREEN_RAM , 0x7800 - 0x7800, 0, 0, NULL, NULL }, - { DO_SET_MEM , DS_BGCOL , 0x7bf0 - 0x7800, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_BGCOL , 0x7bf0 - 0x7800, 0, 0, NULL, NULL }, { DO_COPY , DS_BITMAP_RAM , 0x7c00 - 0x7800, 0, 0, NULL, NULL }, { DO_COPY , DS_COLOR_RAM , 0x9c00 - 0x7800, 0, 0, NULL, NULL }, { DO_LAST , 0 , 0 , 0, 0, NULL, NULL }, @@ -1328,7 +1329,8 @@ { { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, NULL, NULL }, // XXX TODO: Background color is wrong, this offset/addr is from codebase64 docs - { DO_SET_MEM , DS_BGCOL , 0x1f80, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_D020 , 0x1f7f, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_BGCOL , 0x1f80, 0, 0, NULL, NULL }, { DO_COPY , DS_SCREEN_RAM , 0x2000, 0, 0, NULL, NULL }, { DO_COPY , DS_COLOR_RAM , 0x2400, 0, 0, NULL, NULL }, { DO_LAST , 0 , 0 , 0, 0, NULL, NULL }, @@ -1350,9 +1352,9 @@ { { DO_COPY , DS_BITMAP_RAM , 0x4000 + 0x72 - 0x4000, 0, 0, NULL, NULL }, { DO_COPY , DS_SCREEN_RAM , 0x6000 + 0x72 - 0x4000, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_D020 , 0x5f40 + 0x72 - 0x4000, 0, 0, NULL, NULL }, { DO_SET_MEM , DS_COLOR_RAM , 0x5f43 + 0x72 - 0x4000, 0, 0, NULL, NULL }, - { DO_SET_MEM , DS_BGCOL , 0x5f44 + 0x72 - 0x4000, 0, 0, NULL, NULL }, - { DO_SET_MEM , DS_D020 , 0x5f40 + 0x72 - 0x4000, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_BGCOL , 0x5f44 + 0x72 - 0x4000, 0, 0, NULL, NULL }, { DO_LAST , 0 , 0 , 0, 0, NULL, NULL }, } }, @@ -1373,7 +1375,8 @@ { DO_COPY , DS_BITMAP_RAM , 0x0000, 0, 0, NULL, NULL }, { DO_COPY , DS_SCREEN_RAM , 0x2000, 0, 0, NULL, NULL }, { DO_COPY , DS_COLOR_RAM , 0x2400, 0, 0, NULL, NULL }, - { DO_SET_MEM , DS_BGCOL , 0x27ff, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_D020 , 0x27fe, 0, 0, NULL, NULL }, + { DO_SET_MEM_LO, DS_BGCOL , 0x27ff, 0, 0, NULL, NULL }, { DO_LAST , 0 , 0 , 0, 0, NULL, NULL }, } },