Optimized and added autotest for gfx_SetDefaultPalette

Author: ZERICO2005

src/graphx/graphx.asm

@@ -337,12 +337,11 @@ gfx_SetDefaultPalette:
 	ld	a,b
 	rrca
 	xor	a,b
-	and	a,224
+	and	a,$E0
 	xor	a,b
 	ld	(de),a
+	ld	a,e	; E = B * 2, so we can remove one rla
 	inc	de
-	ld	a,b
-	rla
 	rla
 	rla
 	ld	a,b

test/graphx/palette/autotest.json

@@ -0,0 +1,40 @@
+{
+  "transfer_files": [
+    "bin/DEMO.8xp"
+  ],
+  "target": {
+    "name": "DEMO",
+    "isASM": true
+  },
+  "sequence": [
+    "action|launch",
+    "delay|200",
+    "hashWait|1",
+    "key|enter",
+    "delay|300",
+    "hashWait|2"
+  ],
+  "hashes": {
+    "1": {
+      "description": "All tests passed",
+	  "timeout": 5000,
+      "start": "vram_start",
+      "size": "vram_16_size",
+      "expected_CRCs": [
+        "38E2AD5A"
+      ]
+    },
+    "2": {
+      "description": "Exit",
+      "start": "vram_start",
+      "size": "vram_16_size",
+      "expected_CRCs": [
+        "FFAF89BA",
+        "101734A5",
+        "9DA19F44",
+        "A32840C8",
+        "349F4775"
+      ]
+    }
+  }
+}

test/graphx/palette/makefile

@@ -0,0 +1,17 @@
+# ----------------------------
+# Makefile Options
+# ----------------------------
+
+NAME = DEMO
+ICON = icon.png
+DESCRIPTION = "CE C Toolchain Demo"
+COMPRESSED = NO
+
+CFLAGS = -Wall -Wextra -Wshadow -Oz
+CXXFLAGS = -Wall -Wextra -Wshadow -Oz
+
+PREFER_OS_LIBC = NO
+
+# ----------------------------
+
+include $(shell cedev-config --makefile)

test/graphx/palette/src/main.c

@@ -0,0 +1,78 @@
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <graphx.h>
+#include <ti/screen.h>
+#include <ti/getcsc.h>
+#include <sys/util.h>
+
+#define PALETTE_SIZE (256 * sizeof(uint16_t))
+
+const uint8_t palette_8bpp[PALETTE_SIZE] = {
+    0x00, 0x00, 0x81, 0x00, 0x02, 0x01, 0x83, 0x01, 0x04, 0x02, 0x85, 0x02, 0x06, 0x03, 0x87, 0x03,
+    0x08, 0x04, 0x89, 0x04, 0x0a, 0x05, 0x8b, 0x05, 0x0c, 0x06, 0x8d, 0x06, 0x0e, 0x07, 0x8f, 0x07,
+    0x10, 0x08, 0x91, 0x08, 0x12, 0x09, 0x93, 0x09, 0x14, 0x0a, 0x95, 0x0a, 0x16, 0x0b, 0x97, 0x0b,
+    0x18, 0x0c, 0x99, 0x0c, 0x1a, 0x0d, 0x9b, 0x0d, 0x1c, 0x0e, 0x9d, 0x0e, 0x1e, 0x0f, 0x9f, 0x0f,
+    0x00, 0x90, 0x81, 0x90, 0x02, 0x91, 0x83, 0x91, 0x04, 0x92, 0x85, 0x92, 0x06, 0x93, 0x87, 0x93,
+    0x08, 0x94, 0x89, 0x94, 0x0a, 0x95, 0x8b, 0x95, 0x0c, 0x96, 0x8d, 0x96, 0x0e, 0x97, 0x8f, 0x97,
+    0x10, 0x98, 0x91, 0x98, 0x12, 0x99, 0x93, 0x99, 0x14, 0x9a, 0x95, 0x9a, 0x16, 0x9b, 0x97, 0x9b,
+    0x18, 0x9c, 0x99, 0x9c, 0x1a, 0x9d, 0x9b, 0x9d, 0x1c, 0x9e, 0x9d, 0x9e, 0x1e, 0x9f, 0x9f, 0x9f,
+    0x20, 0x20, 0xa1, 0x20, 0x22, 0x21, 0xa3, 0x21, 0x24, 0x22, 0xa5, 0x22, 0x26, 0x23, 0xa7, 0x23,
+    0x28, 0x24, 0xa9, 0x24, 0x2a, 0x25, 0xab, 0x25, 0x2c, 0x26, 0xad, 0x26, 0x2e, 0x27, 0xaf, 0x27,
+    0x30, 0x28, 0xb1, 0x28, 0x32, 0x29, 0xb3, 0x29, 0x34, 0x2a, 0xb5, 0x2a, 0x36, 0x2b, 0xb7, 0x2b,
+    0x38, 0x2c, 0xb9, 0x2c, 0x3a, 0x2d, 0xbb, 0x2d, 0x3c, 0x2e, 0xbd, 0x2e, 0x3e, 0x2f, 0xbf, 0x2f,
+    0x20, 0xb0, 0xa1, 0xb0, 0x22, 0xb1, 0xa3, 0xb1, 0x24, 0xb2, 0xa5, 0xb2, 0x26, 0xb3, 0xa7, 0xb3,
+    0x28, 0xb4, 0xa9, 0xb4, 0x2a, 0xb5, 0xab, 0xb5, 0x2c, 0xb6, 0xad, 0xb6, 0x2e, 0xb7, 0xaf, 0xb7,
+    0x30, 0xb8, 0xb1, 0xb8, 0x32, 0xb9, 0xb3, 0xb9, 0x34, 0xba, 0xb5, 0xba, 0x36, 0xbb, 0xb7, 0xbb,
+    0x38, 0xbc, 0xb9, 0xbc, 0x3a, 0xbd, 0xbb, 0xbd, 0x3c, 0xbe, 0xbd, 0xbe, 0x3e, 0xbf, 0xbf, 0xbf,
+    0x40, 0x40, 0xc1, 0x40, 0x42, 0x41, 0xc3, 0x41, 0x44, 0x42, 0xc5, 0x42, 0x46, 0x43, 0xc7, 0x43,
+    0x48, 0x44, 0xc9, 0x44, 0x4a, 0x45, 0xcb, 0x45, 0x4c, 0x46, 0xcd, 0x46, 0x4e, 0x47, 0xcf, 0x47,
+    0x50, 0x48, 0xd1, 0x48, 0x52, 0x49, 0xd3, 0x49, 0x54, 0x4a, 0xd5, 0x4a, 0x56, 0x4b, 0xd7, 0x4b,
+    0x58, 0x4c, 0xd9, 0x4c, 0x5a, 0x4d, 0xdb, 0x4d, 0x5c, 0x4e, 0xdd, 0x4e, 0x5e, 0x4f, 0xdf, 0x4f,
+    0x40, 0xd0, 0xc1, 0xd0, 0x42, 0xd1, 0xc3, 0xd1, 0x44, 0xd2, 0xc5, 0xd2, 0x46, 0xd3, 0xc7, 0xd3,
+    0x48, 0xd4, 0xc9, 0xd4, 0x4a, 0xd5, 0xcb, 0xd5, 0x4c, 0xd6, 0xcd, 0xd6, 0x4e, 0xd7, 0xcf, 0xd7,
+    0x50, 0xd8, 0xd1, 0xd8, 0x52, 0xd9, 0xd3, 0xd9, 0x54, 0xda, 0xd5, 0xda, 0x56, 0xdb, 0xd7, 0xdb,
+    0x58, 0xdc, 0xd9, 0xdc, 0x5a, 0xdd, 0xdb, 0xdd, 0x5c, 0xde, 0xdd, 0xde, 0x5e, 0xdf, 0xdf, 0xdf,
+    0x60, 0x60, 0xe1, 0x60, 0x62, 0x61, 0xe3, 0x61, 0x64, 0x62, 0xe5, 0x62, 0x66, 0x63, 0xe7, 0x63,
+    0x68, 0x64, 0xe9, 0x64, 0x6a, 0x65, 0xeb, 0x65, 0x6c, 0x66, 0xed, 0x66, 0x6e, 0x67, 0xef, 0x67,
+    0x70, 0x68, 0xf1, 0x68, 0x72, 0x69, 0xf3, 0x69, 0x74, 0x6a, 0xf5, 0x6a, 0x76, 0x6b, 0xf7, 0x6b,
+    0x78, 0x6c, 0xf9, 0x6c, 0x7a, 0x6d, 0xfb, 0x6d, 0x7c, 0x6e, 0xfd, 0x6e, 0x7e, 0x6f, 0xff, 0x6f,
+    0x60, 0xf0, 0xe1, 0xf0, 0x62, 0xf1, 0xe3, 0xf1, 0x64, 0xf2, 0xe5, 0xf2, 0x66, 0xf3, 0xe7, 0xf3,
+    0x68, 0xf4, 0xe9, 0xf4, 0x6a, 0xf5, 0xeb, 0xf5, 0x6c, 0xf6, 0xed, 0xf6, 0x6e, 0xf7, 0xef, 0xf7,
+    0x70, 0xf8, 0xf1, 0xf8, 0x72, 0xf9, 0xf3, 0xf9, 0x74, 0xfa, 0xf5, 0xfa, 0x76, 0xfb, 0xf7, 0xfb,
+    0x78, 0xfc, 0xf9, 0xfc, 0x7a, 0xfd, 0xfb, 0xfd, 0x7c, 0xfe, 0xfd, 0xfe, 0x7e, 0xff, 0xff, 0xff,
+};
+
+const char* test(void) {
+    if (memcmp(gfx_palette, palette_8bpp, PALETTE_SIZE) != 0) {
+        return "gfx_Begin != palette_8bpp";
+    }
+    // wipe the previous palette
+    memset(gfx_palette, 0xAA, PALETTE_SIZE);
+    gfx_SetDefaultPalette(gfx_8bpp);
+    if (memcmp(gfx_palette, palette_8bpp, PALETTE_SIZE) != 0) {
+        return "gfx_SetDefaultPalette != palette_8bpp";
+    }
+
+    return "All tests passed";
+}
+
+int main(void) {
+    // wipe the previous palette
+    memset(gfx_palette, 0x55, PALETTE_SIZE);
+
+    gfx_Begin();
+
+    const char* result = test();
+
+    gfx_End();
+
+    os_ClrHome();
+
+    fputs(result, stdout);
+
+    while (!os_GetCSC());
+
+    return 0;
+}