From e3094b18d4fc1b5f8e5e7ca146318e501a7a4ff9 Mon Sep 17 00:00:00 2001 From: jaseg Date: Fri, 5 Jan 2018 11:53:52 +0100 Subject: Firmware directory reorganization --- fw/Makefile | 27 ++-- fw/MatrixTransform.ipynb | 218 --------------------------- fw/bus_addr.c | 3 - fw/crc.c | 59 -------- fw/crc.py | 8 - fw/gen_cmsis_exports.py | 30 ---- fw/mac.c | 2 +- fw/mapparse.py | 129 ---------------- fw/mapvis.py | 25 --- fw/measure_transpose_performance.gdb | 17 --- fw/profile.gdb | 5 - fw/profile.sh | 26 ---- fw/semihosting.c | 10 -- fw/test.py | 140 ----------------- fw/tools/MatrixTransform.ipynb | 218 +++++++++++++++++++++++++++ fw/tools/circle.jpg | Bin 0 -> 17331 bytes fw/tools/gen_cmsis_exports.py | 30 ++++ fw/tools/mapparse.py | 129 ++++++++++++++++ fw/tools/mapvis.py | 25 +++ fw/tools/measure_transpose_performance.gdb | 17 +++ fw/tools/profile.gdb | 5 + fw/tools/profile.sh | 26 ++++ fw/tools/pymapfile | 1 + fw/tools/scans/digit.png | Bin 0 -> 5043 bytes fw/tools/scans/megumin_segmentmap_600dpi.jpg | Bin 0 -> 1786337 bytes fw/tools/scans/pretty.jpg | Bin 0 -> 136795 bytes fw/tools/scans/pretty.png | Bin 0 -> 157263 bytes fw/tools/scans/pretty2.png | Bin 0 -> 270647 bytes fw/tools/segmasks/seg1.png | Bin 0 -> 859 bytes fw/tools/segmasks/seg2.png | Bin 0 -> 1406 bytes fw/tools/segmasks/seg3.png | Bin 0 -> 1355 bytes fw/tools/segmasks/seg4.png | Bin 0 -> 914 bytes fw/tools/segmasks/seg5.png | Bin 0 -> 1360 bytes fw/tools/segmasks/seg6.png | Bin 0 -> 1340 bytes fw/tools/segmasks/seg7.png | Bin 0 -> 781 bytes fw/tools/segmasks/seg8.png | Bin 0 -> 699 bytes fw/tools/test.py | 140 +++++++++++++++++ fw/tools/transpose_test.c | 77 ++++++++++ fw/transpose_main.c | 77 ---------- 39 files changed, 684 insertions(+), 760 deletions(-) delete mode 100644 fw/MatrixTransform.ipynb delete mode 100644 fw/bus_addr.c delete mode 100644 fw/crc.c delete mode 100644 fw/crc.py delete mode 100644 fw/gen_cmsis_exports.py delete mode 100644 fw/mapparse.py delete mode 100644 fw/mapvis.py delete mode 100644 fw/measure_transpose_performance.gdb delete mode 100644 fw/profile.gdb delete mode 100644 fw/profile.sh delete mode 100644 fw/semihosting.c delete mode 100755 fw/test.py create mode 100644 fw/tools/MatrixTransform.ipynb create mode 100644 fw/tools/circle.jpg create mode 100644 fw/tools/gen_cmsis_exports.py create mode 100644 fw/tools/mapparse.py create mode 100644 fw/tools/mapvis.py create mode 100644 fw/tools/measure_transpose_performance.gdb create mode 100644 fw/tools/profile.gdb create mode 100644 fw/tools/profile.sh create mode 160000 fw/tools/pymapfile create mode 100644 fw/tools/scans/digit.png create mode 100644 fw/tools/scans/megumin_segmentmap_600dpi.jpg create mode 100644 fw/tools/scans/pretty.jpg create mode 100644 fw/tools/scans/pretty.png create mode 100644 fw/tools/scans/pretty2.png create mode 100644 fw/tools/segmasks/seg1.png create mode 100644 fw/tools/segmasks/seg2.png create mode 100644 fw/tools/segmasks/seg3.png create mode 100644 fw/tools/segmasks/seg4.png create mode 100644 fw/tools/segmasks/seg5.png create mode 100644 fw/tools/segmasks/seg6.png create mode 100644 fw/tools/segmasks/seg7.png create mode 100644 fw/tools/segmasks/seg8.png create mode 100755 fw/tools/test.py create mode 100644 fw/tools/transpose_test.c delete mode 100644 fw/transpose_main.c (limited to 'fw') diff --git a/fw/Makefile b/fw/Makefile index 0b4e3ab..70f1132 100644 --- a/fw/Makefile +++ b/fw/Makefile @@ -1,9 +1,9 @@ -# put your *.o targets here, make should handle the rest! -CMSIS_PATH ?= STM32Cube/Drivers/CMSIS +CUBE_PATH ?= $(wildcard ~)/resource/STM32CubeF0 +CMSIS_PATH ?= $(CUBE_PATH)/Drivers/CMSIS CMSIS_DEV_PATH ?= $(CMSIS_PATH)/Device/ST/STM32F0xx -HAL_PATH ?= STM32Cube/Drivers/STM32F0xx_HAL_Driver +HAL_PATH ?= $(CUBE_PATH)/Drivers/STM32F0xx_HAL_Driver -BUS_ADDR ?= 0 +MAC_ADDR ?= 0xdeadbeef CC := arm-none-eabi-gcc LD := arm-none-eabi-ld @@ -11,7 +11,7 @@ OBJCOPY := arm-none-eabi-objcopy OBJDUMP := arm-none-eabi-objdump SIZE := arm-none-eabi-size -CFLAGS = -g -Wall -std=gnu11 -O0 -fdump-rtl-expand -DBUS_ADDR=$(BUS_ADDR) +CFLAGS = -g -Wall -std=gnu11 -O0 -fdump-rtl-expand -DMAC_ADDR=$(MAC_ADDR) CFLAGS += -mlittle-endian -mcpu=cortex-m0 -march=armv6-m -mthumb #CFLAGS += -ffunction-sections -fdata-sections LDFLAGS = -nostartfiles @@ -32,12 +32,12 @@ LDFLAGS += -L$(CMSIS_PATH)/Lib/GCC -larm_cortexM0l_math ################################################### -.PHONY: program clean bus_addr.c +.PHONY: program clean all: main.elf cmsis_exports.c: $(CMSIS_DEV_PATH)/Include/stm32f030x6.h $(CMSIS_PATH)/Include/core_cm0.h - python3 gen_cmsis_exports.py $^ > $@ + python3 tools/gen_cmsis_exports.py $^ > $@ %.o: %.c $(CC) -c $(CFLAGS) -o $@ $^ @@ -61,7 +61,7 @@ sources.c: sources.tar.xz.zip xxd -i $< | head -n -1 | sed 's/=/__attribute__((section(".source_tarball"))) =/' > $@ # FIXME re-add sources.o -main.elf: main.o startup_stm32f030x6.o system_stm32f0xx.o $(HAL_PATH)/Src/stm32f0xx_ll_utils.o base.o cmsis_exports.o transpose.o bus_addr.o mac.o +main.elf: main.o startup_stm32f030x6.o system_stm32f0xx.o $(HAL_PATH)/Src/stm32f0xx_ll_utils.o base.o cmsis_exports.o transpose.o mac.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(OBJCOPY) -O ihex $@ $(@:.elf=.hex) $(OBJCOPY) -O binary $@ $(@:.elf=.bin) @@ -71,12 +71,12 @@ main.elf: main.o startup_stm32f030x6.o system_stm32f0xx.o $(HAL_PATH)/Src/stm32f program: main.elf openocd.cfg openocd -f openocd.cfg -c "program $< verify reset exit" -transpose.elf: transpose.c transpose_main.c +tools/transpose_test: transpose.c tools/transpose_test.c gcc -g -Wall -Wpedantic -o $@ $^ -.PHONY: transpose_test -transpose_test: transpose.elf - ./transpose.elf +.PHONY: run_transpose_test +run_transpose_test: tools/transpose_test + tools/transpose_test _crc.so: crc.c gcc -o $@ -shared -fPIC -g $^ @@ -87,6 +87,9 @@ clean: rm -f **.expand rm -f transpose.elf rm -f crc.so + rm -f cmsis_exports.c rm -f sources.tar.xz + rm -f sources.tar.xz.zip rm -f sources.c + rm -f *.dot diff --git a/fw/MatrixTransform.ipynb b/fw/MatrixTransform.ipynb deleted file mode 100644 index 8e95469..0000000 --- a/fw/MatrixTransform.ipynb +++ /dev/null @@ -1,218 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 129, - "metadata": { - "collapsed": false - }, - "outputs": [], - "source": [ - "import struct\n", - "\n", - "import serial\n", - "import PIL\n", - "import numpy as np\n", - "from matplotlib import pyplot as plt\n", - "%matplotlib inline\n", - "\n", - "import crc" - ] - }, - { - "cell_type": "code", - "execution_count": 102, - "metadata": { - "collapsed": false - }, - "outputs": [], - "source": [ - "digit_mask = PIL.Image.open('scans/digit.png')\n", - "seg_masks = [ np.asarray(PIL.Image.open('segmasks/seg{}.png'.format(i)), dtype=np.float)[:,:,0]/255.0 for i in range(1,9) ]\n", - "digit_h, digit_w = seg_masks[0].shape" - ] - }, - { - "cell_type": "code", - "execution_count": 193, - "metadata": { - "collapsed": false - }, - "outputs": [], - "source": [ - "pic = PIL.Image.open('circle.jpg')" - ] - }, - { - "cell_type": "code", - "execution_count": 194, - "metadata": { - "collapsed": false - }, - "outputs": [], - "source": [ - "dpi = 600\n", - "scale = 1000/5091\n", - "stride_x, stride_y = 1.0*dpi*scale, 38.8/25.4*dpi*scale" - ] - }, - { - "cell_type": "code", - "execution_count": 195, - "metadata": { - "collapsed": false - }, - "outputs": [], - "source": [ - "mask_w, mask_h = int(8*stride_x)+1, int(4*stride_y)+1\n", - "resized = np.asarray(pic.resize((mask_w, mask_h), PIL.Image.BILINEAR).convert('HSV'), dtype=np.float)[:,:,2]/255" - ] - }, - { - "cell_type": "code", - "execution_count": 196, - "metadata": { - "collapsed": false - }, - "outputs": [], - "source": [ - "def sub(resized, x, y):\n", - " return resized[int(y*stride_y):int(y*stride_y)+digit_h, int(x*stride_x):int(x*stride_x)+digit_w]" - ] - }, - { - "cell_type": "code", - "execution_count": 197, - "metadata": { - "collapsed": true - }, - "outputs": [], - "source": [ - "def digit_values(resized, x, y):\n", - " img = sub(resized, x, y)/255.0\n", - " for mask in seg_masks:\n", - " yield np.average(np.multiply(mask, img))" - ] - }, - { - "cell_type": "code", - "execution_count": 198, - "metadata": { - "collapsed": false - }, - "outputs": [], - "source": [ - "def make_vals(resized):\n", - " subvals = np.zeros((8, 4, 8), dtype=np.float)\n", - " for x in range(8):\n", - " for y in range(4):\n", - " subvals[x,y] = list(digit_values(resized, x, y))\n", - " return subvals" - ] - }, - { - "cell_type": "code", - "execution_count": 204, - "metadata": { - "collapsed": true - }, - "outputs": [], - "source": [ - "def send_packet(ser, resized, addr=5):\n", - " gamma = 2\n", - " out = np.clip(np.power(make_vals(resized), 1/gamma)*255, 0, 255).astype(np.uint8)\n", - " pkt = b''\n", - " for x in range(8):\n", - " for y in range(4):\n", - " pkt += bytes(out[x,y,:]) + b'\\x00\\x00'\n", - " pkt += b'\\x03\\x00\\x00\\x00'\n", - " pkt += struct.pack('I', crc.crc(pkt))\n", - " pkt = bytes([0x40 | addr]) + pkt\n", - " ser.write(pkt)\n", - " return out" - ] - }, - { - "cell_type": "code", - "execution_count": 205, - "metadata": { - "collapsed": false - }, - "outputs": [ - { - "data": { - "text/plain": [ - "array([[[3, 3, 3, 3, 3, 3, 3, 1],\n", - " [3, 3, 3, 3, 3, 3, 3, 1],\n", - " [3, 3, 3, 3, 3, 3, 3, 1],\n", - " [3, 3, 3, 3, 3, 3, 3, 1]],\n", - "\n", - " [[3, 3, 3, 3, 3, 3, 3, 1],\n", - " [3, 3, 3, 3, 3, 3, 3, 0],\n", - " [2, 3, 0, 3, 3, 3, 3, 1],\n", - " [3, 3, 3, 3, 3, 3, 3, 1]],\n", - "\n", - " [[3, 3, 3, 3, 3, 3, 3, 1],\n", - " [1, 2, 0, 0, 0, 0, 0, 0],\n", - " [0, 0, 0, 0, 0, 0, 0, 0],\n", - " [3, 3, 3, 3, 3, 3, 3, 1]],\n", - "\n", - " [[3, 3, 3, 3, 3, 3, 3, 1],\n", - " [0, 0, 0, 0, 0, 0, 0, 0],\n", - " [0, 0, 0, 0, 0, 0, 0, 0],\n", - " [0, 2, 2, 3, 3, 3, 3, 1]],\n", - "\n", - " [[3, 3, 3, 3, 3, 3, 3, 1],\n", - " [0, 0, 0, 0, 0, 0, 0, 0],\n", - " [0, 0, 0, 0, 0, 0, 0, 0],\n", - " [0, 2, 2, 3, 3, 3, 3, 1]],\n", - "\n", - " [[3, 3, 3, 3, 3, 3, 3, 1],\n", - " [1, 0, 2, 0, 0, 0, 0, 0],\n", - " [0, 0, 0, 0, 0, 0, 0, 0],\n", - " [3, 3, 3, 3, 3, 3, 3, 1]],\n", - "\n", - " [[3, 3, 3, 3, 3, 3, 3, 1],\n", - " [3, 3, 3, 3, 0, 3, 1, 1],\n", - " [2, 0, 3, 2, 1, 3, 3, 1],\n", - " [3, 3, 3, 3, 3, 3, 3, 1]],\n", - "\n", - " [[3, 3, 3, 3, 3, 3, 3, 1],\n", - " [3, 3, 3, 3, 3, 3, 3, 1],\n", - " [3, 3, 3, 3, 3, 3, 3, 1],\n", - " [3, 3, 3, 3, 3, 3, 3, 1]]], dtype=uint8)" - ] - }, - "execution_count": 205, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "ser = serial.Serial('/dev/serial/by-id/usb-FTDI_FT232R_USB_UART_A90JRHXH-if00-port0', 2000000)\n", - "send_packet(ser, resized)" - ] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.5.3" - } - }, - "nbformat": 4, - "nbformat_minor": 0 -} diff --git a/fw/bus_addr.c b/fw/bus_addr.c deleted file mode 100644 index 5e1fa2a..0000000 --- a/fw/bus_addr.c +++ /dev/null @@ -1,3 +0,0 @@ - -#include -uint8_t bus_addr = BUS_ADDR; diff --git a/fw/crc.c b/fw/crc.c deleted file mode 100644 index 5e5c7d2..0000000 --- a/fw/crc.c +++ /dev/null @@ -1,59 +0,0 @@ -/* MPEG-2 CRC as done by the STM32F0 hardware CRC unit */ -#include - -/* CRC32 lookup table for polynomial 0x04c11db7 */ -static u_long crc_table[256] = { - 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, - 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, - 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7, - 0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75, - 0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, - 0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, - 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef, - 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d, - 0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb, - 0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, - 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0, - 0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072, - 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4, - 0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, - 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08, - 0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba, - 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc, - 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6, - 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050, - 0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, - 0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34, - 0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637, - 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1, - 0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53, - 0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, - 0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff, - 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9, - 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b, - 0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, - 0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, - 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71, - 0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3, - 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2, - 0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8, - 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e, - 0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec, - 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a, - 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0, - 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676, - 0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, - 0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662, - 0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668, - 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4}; - -u_long crc32 (char *data, int len) -{ - register int i; - u_long crc = 0xffffffff; - - for (i=0; i> 24) ^ *data++) & 0xff]; - - return crc; -} diff --git a/fw/crc.py b/fw/crc.py deleted file mode 100644 index 043c6e9..0000000 --- a/fw/crc.py +++ /dev/null @@ -1,8 +0,0 @@ -import ctypes -import os -lib = ctypes.CDLL(os.path.join(os.path.dirname(__file__), '_crc.so')) -lib.crc32.restype = ctypes.c_uint32 -def crc(data): - if type(data) is not bytes: - raise TypeError('This only works with bytes') - return lib.crc32(data, len(data)) diff --git a/fw/gen_cmsis_exports.py b/fw/gen_cmsis_exports.py deleted file mode 100644 index ba3422b..0000000 --- a/fw/gen_cmsis_exports.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python3 -import re -import os - -if __name__ == '__main__': - import argparse - - parser = argparse.ArgumentParser() - parser.add_argument('cmsis_device_header', nargs='+', type=argparse.FileType('rb')) - args = parser.parse_args() - - print('#ifndef __GENERATED_CMSIS_HEADER_EXPORTS__') - print('#define __GENERATED_CMSIS_HEADER_EXPORTS__') - print() - for header in args.cmsis_device_header: - lines = header.readlines() - name = os.path.basename(header.name) - print('#include <{}>'.format(name)) - print() - - print('/* {} */'.format(name)) - for l in lines: - match = re.match(b'^#define (\w+)\s+\W*(\w+_TypeDef|\w+_Type).*$', l) - if match: - inst, typedef = match.groups() - inst, typedef = inst.decode(), typedef.decode() - print('{} *{} = {};'.format(typedef, inst.lower(), inst)) - print() - print('#endif//__GENERATED_CMSIS_HEADER_EXPORTS__') - diff --git a/fw/mac.c b/fw/mac.c index 4d05c9a..b2fb48a 100644 --- a/fw/mac.c +++ b/fw/mac.c @@ -1,3 +1,3 @@ #include "mac.h" -uint32_t device_mac = 0xdeadbeef; +uint32_t device_mac = MAC_ADDR; diff --git a/fw/mapparse.py b/fw/mapparse.py deleted file mode 100644 index c1f460a..0000000 --- a/fw/mapparse.py +++ /dev/null @@ -1,129 +0,0 @@ - -import re -from collections import defaultdict, namedtuple - -Section = namedtuple('Section', ['name', 'offset', 'objects']) -ObjectEntry = namedtuple('ObjectEntry', ['filename', 'object', 'offset', 'size']) -FileEntry = namedtuple('FileEntry', ['section', 'object', 'offset', 'length']) - -class Memory: - def __init__(self, name, origin, length, attrs=''): - self.name, self.origin, self.length, self.attrs = name, origin, length, attrs - self.sections = {} - self.files = defaultdict(lambda: []) - self.totals = defaultdict(lambda: 0) - - def add_toplevel(self, name, offx, length): - self.sections[name] = Section(offx, length, []) - - def add_obj(self, name, offx, length, fn, obj): - base_section, sep, subsec = name[1:].partition('.') - base_section = '.'+base_section - if base_section in self.sections: - sec = secname, secoffx, secobjs = self.sections[base_section] - secobjs.append(ObjectEntry(fn, obj, offx, length)) - else: - sec = None - self.files[fn].append(FileEntry(sec, obj, offx, length)) - self.totals[fn] += length - -class MapFile: - def __init__(self, s): - self._lines = s.splitlines() - self.memcfg = {} - self.defaultmem = Memory('default', 0, 0xffffffffffffffff) - self._parse() - - def __getitem__(self, offx_or_name): - ''' Lookup a memory area by name or address ''' - if offx_or_name in self.memcfg: - return self.memcfg[offx_or_name] - - elif isinstance(offx_or_name, int): - for mem in self.memcfg.values(): - if mem.origin <= offx_or_name < mem.origin+mem.length: - return mem - else: - return self.defaultmem - - raise ValueError('Invalid argument type for indexing') - - def _skip(self, regex): - matcher = re.compile(regex) - for l in self: - if matcher.match(l): - break - - def __iter__(self): - while self._lines: - yield self._lines.pop(0) - - def _parse(self): - self._skip('^Memory Configuration') - - # Parse memory segmentation info - self._skip('^Name') - for l in self: - if not l: - break - name, origin, length, *attrs = l.split() - if not name.startswith('*'): - self.memcfg[name] = Memory(name, int(origin, 16), int(length, 16), attrs[0] if attrs else '') - - # Parse section information - toplevel_m = re.compile('^(\.[a-zA-Z0-9_.]+)\s+(0x[0-9a-fA-F]+)\s+(0x[0-9a-fA-F]+)') - secondlevel_m = re.compile('^ (\.[a-zA-Z0-9_.]+)\s+(0x[0-9a-fA-F]+)\s+(0x[0-9a-fA-F]+)\s+(.*)$') - secondlevel_linebreak_m = re.compile('^ (\.[a-zA-Z0-9_.]+)\n') - filelike = re.compile('^(/?[^()]*\.[a-zA-Z0-9-_]+)(\(.*\))?') - linebreak_section = None - for l in self: - # Toplevel section - match = toplevel_m.match(l) - if match: - name, offx, length = match.groups() - offx, length = int(offx, 16), int(length, 16) - self[offx].add_toplevel(name, offx, length) - - match = secondlevel_linebreak_m.match(l) - if match: - linebreak_section, = match.groups() - continue - - if linebreak_section: - l = ' {} {}'.format(linebreak_section, l) - linebreak_section = None - - # Second-level section - match = secondlevel_m.match(l) - if match: - name, offx, length, misc = match.groups() - match = filelike.match(misc) - if match: - fn, obj = match.groups() - obj = obj.strip('()') if obj else None - offx, length = int(offx, 16), int(length, 16) - self[offx].add_obj(name, offx, length, fn, obj) - - -if __name__ == '__main__': - import argparse - parser = argparse.ArgumentParser(description='Parser GCC map file') - parser.add_argument('mapfile', type=argparse.FileType('r'), help='The GCC .map file to parse') - parser.add_argument('-m', '--memory', type=str, help='The memory segments to print, comma-separated') - args = parser.parse_args() - mf = MapFile(args.mapfile.read()) - args.mapfile.close() - - mems = args.memory.split(',') if args.memory else mf.memcfg.keys() - - for name in mems: - mem = mf.memcfg[name] - print('Symbols by file for memory', name) - for tot, fn in reversed(sorted( (tot, fn) for fn, tot in mem.totals.items() )): - print(' {:>8} {}'.format(tot, fn)) - for length, offx, sec, obj in reversed(sorted(( (length, offx, sec, obj) for sec, obj, offx, length in - mem.files[fn] ), key=lambda e: e[0] )): - name = sec.name if sec else None - print(' {:>8} {:>#08x} {}'.format(length, offx, obj)) - #print('{:>16} 0x{:016x} 0x{:016x} ({:>24}) {}'.format(name, origin, length, length, attrs)) - diff --git a/fw/mapvis.py b/fw/mapvis.py deleted file mode 100644 index 4a71222..0000000 --- a/fw/mapvis.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python3 - -from matplotlib import pyplot as plt - -f, ax = plt.subplots(1, figsize=(3, 8)) -bar_width = 1 - -ax.bar([-bar_width/2], top, bottom=bottom, width=bar_width, label='foo') -ax.set_xticks([0], [filename]) -ax.set_ylabel('Memory usage (B)') -ax.set_xlabel('') - -ax.set_xlim([-bar_width/2, bar_width/2]) -ax.set_ylim([0, mem_max]) - -if __name__ == '__main__': - import argparse - import mapparse - parser = argparse.ArgumentParser(description='Visualize program memory usage using GCC map file') - parser.add_argument('mapfile', type=argparse.FileType('r'), description='Input GCC .map file') - args = parser.parse_args() - - mapping = mapparse.MapFile(args.mapfile.read()) - mapping. - diff --git a/fw/measure_transpose_performance.gdb b/fw/measure_transpose_performance.gdb deleted file mode 100644 index 966d69f..0000000 --- a/fw/measure_transpose_performance.gdb +++ /dev/null @@ -1,17 +0,0 @@ -target remote localhost:3333 -file main.elf -load -set print pretty on -set pagination off -cont -print cvr/50.0F -cont -print cvr/50.0F -cont -print cvr/50.0F -cont -print cvr/50.0F -cont -print cvr/50.0F -cont -quit diff --git a/fw/profile.gdb b/fw/profile.gdb deleted file mode 100644 index fd26540..0000000 --- a/fw/profile.gdb +++ /dev/null @@ -1,5 +0,0 @@ -set pagination off -target remote localhost:3333 -while(1) - continue -end diff --git a/fw/profile.sh b/fw/profile.sh deleted file mode 100644 index b209a14..0000000 --- a/fw/profile.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -NLOOPS=1000 -SLEEP=0.1 - -[ $# -lt 1 ] && echo "ERROR: Not enough arguments" && exit 2 -elffile="$1" - -trap "exit" SIGINT - -logfile=$(mktemp) - -arm-none-eabi-gdb -x profile.gdb "$elffile" > "$logfile" 2>/dev/null& -gdbpid=$! -trap "kill -TERM $gdbpid; rm $logfile" EXIT -echo "Gathering..." -for i in $(seq 1 $NLOOPS); do - echo "$i/$NLOOPS" - kill -INT $gdbpid - sleep $SLEEP -done -kill -TERM $gdbpid -trap "rm '$logfile'" EXIT - -egrep -o '\w+ \(.*\) at .*' "$logfile" |cut -d' ' -f1|sort|uniq -c|sort -n -echo 'Total:' $(egrep -c '\w+ \(.*\) at .*' "$logfile") - diff --git a/fw/semihosting.c b/fw/semihosting.c deleted file mode 100644 index 96ebc7a..0000000 --- a/fw/semihosting.c +++ /dev/null @@ -1,10 +0,0 @@ - -#define SYS_WRITE0 0x04 - -void write0(const char *c) __attribute__((naked)); -void write0(const char *c) { - __asm__("mov r1, %0" : : "r" (c)); - __asm__("mov r0, %0" : : "I" (SYS_WRITE0)); - __asm__("bkpt 0xab"); - __asm__("bx lr"); -} diff --git a/fw/test.py b/fw/test.py deleted file mode 100755 index 63cb324..0000000 --- a/fw/test.py +++ /dev/null @@ -1,140 +0,0 @@ -#!/usr/bin/env python3 -import serial -import struct -from itertools import takewhile - -def chunked(data, chunk_size): - for i in range(0, len(data), chunk_size): - yield data[i:i+chunk_size] - -def frame_packet(data): - if len(data) > 254: - raise ValueError('Input too long') - out = b'' - for run in data.split(b'\0'): - out += bytes([len(run)+1]) - out += run - out += b'\0' - return out - -def format_packet(data): - out = b'' - for a, b, c, d, e, f, g, h in chunked(data, 8): - ah, bh, ch, dh = a>>8, b>>8, c>>8, d>>8 - eh, fh, gh, hh = e>>8, f>>8, g>>8, h>>8 - al, bl, cl, dl = a&0xff, b&0xff, c&0xff, d&0xff - el, fl, gl, hl = e&0xff, f&0xff, g&0xff, h&0xff - # FIXME check order of high bits - out += bytes([al, bl, cl, dl, el, fl, gl, hl, - (ah<<6 | bh<<4 | ch<<2 | dh<<0)&0xff, - (eh<<6 | fh<<4 | gh<<2 | hh<<0)&0xff]) - out += bytes([1, 0, 0, 0]) # global intensity - return out - -def chariter(ser): - while True: - yield ser.read(1) - -def read_frame(ser): - return b''.join(takewhile(lambda c: c and c[0], chariter(ser))) - -def unstuff(data): - out = b'' - while data: - stuff = data[0] - if out: - out += b'\0' - out += data[1:stuff] - data = data[stuff:] - return out - -def receive_frame(ser): - return unstuff(read_frame(ser)) - -def mac_frame(mac): - return frame_packet(struct.pack(''.format(name)) + print() + + print('/* {} */'.format(name)) + for l in lines: + match = re.match(b'^#define (\w+)\s+\W*(\w+_TypeDef|\w+_Type).*$', l) + if match: + inst, typedef = match.groups() + inst, typedef = inst.decode(), typedef.decode() + print('{} *{} = {};'.format(typedef, inst.lower(), inst)) + print() + print('#endif//__GENERATED_CMSIS_HEADER_EXPORTS__') + diff --git a/fw/tools/mapparse.py b/fw/tools/mapparse.py new file mode 100644 index 0000000..c1f460a --- /dev/null +++ b/fw/tools/mapparse.py @@ -0,0 +1,129 @@ + +import re +from collections import defaultdict, namedtuple + +Section = namedtuple('Section', ['name', 'offset', 'objects']) +ObjectEntry = namedtuple('ObjectEntry', ['filename', 'object', 'offset', 'size']) +FileEntry = namedtuple('FileEntry', ['section', 'object', 'offset', 'length']) + +class Memory: + def __init__(self, name, origin, length, attrs=''): + self.name, self.origin, self.length, self.attrs = name, origin, length, attrs + self.sections = {} + self.files = defaultdict(lambda: []) + self.totals = defaultdict(lambda: 0) + + def add_toplevel(self, name, offx, length): + self.sections[name] = Section(offx, length, []) + + def add_obj(self, name, offx, length, fn, obj): + base_section, sep, subsec = name[1:].partition('.') + base_section = '.'+base_section + if base_section in self.sections: + sec = secname, secoffx, secobjs = self.sections[base_section] + secobjs.append(ObjectEntry(fn, obj, offx, length)) + else: + sec = None + self.files[fn].append(FileEntry(sec, obj, offx, length)) + self.totals[fn] += length + +class MapFile: + def __init__(self, s): + self._lines = s.splitlines() + self.memcfg = {} + self.defaultmem = Memory('default', 0, 0xffffffffffffffff) + self._parse() + + def __getitem__(self, offx_or_name): + ''' Lookup a memory area by name or address ''' + if offx_or_name in self.memcfg: + return self.memcfg[offx_or_name] + + elif isinstance(offx_or_name, int): + for mem in self.memcfg.values(): + if mem.origin <= offx_or_name < mem.origin+mem.length: + return mem + else: + return self.defaultmem + + raise ValueError('Invalid argument type for indexing') + + def _skip(self, regex): + matcher = re.compile(regex) + for l in self: + if matcher.match(l): + break + + def __iter__(self): + while self._lines: + yield self._lines.pop(0) + + def _parse(self): + self._skip('^Memory Configuration') + + # Parse memory segmentation info + self._skip('^Name') + for l in self: + if not l: + break + name, origin, length, *attrs = l.split() + if not name.startswith('*'): + self.memcfg[name] = Memory(name, int(origin, 16), int(length, 16), attrs[0] if attrs else '') + + # Parse section information + toplevel_m = re.compile('^(\.[a-zA-Z0-9_.]+)\s+(0x[0-9a-fA-F]+)\s+(0x[0-9a-fA-F]+)') + secondlevel_m = re.compile('^ (\.[a-zA-Z0-9_.]+)\s+(0x[0-9a-fA-F]+)\s+(0x[0-9a-fA-F]+)\s+(.*)$') + secondlevel_linebreak_m = re.compile('^ (\.[a-zA-Z0-9_.]+)\n') + filelike = re.compile('^(/?[^()]*\.[a-zA-Z0-9-_]+)(\(.*\))?') + linebreak_section = None + for l in self: + # Toplevel section + match = toplevel_m.match(l) + if match: + name, offx, length = match.groups() + offx, length = int(offx, 16), int(length, 16) + self[offx].add_toplevel(name, offx, length) + + match = secondlevel_linebreak_m.match(l) + if match: + linebreak_section, = match.groups() + continue + + if linebreak_section: + l = ' {} {}'.format(linebreak_section, l) + linebreak_section = None + + # Second-level section + match = secondlevel_m.match(l) + if match: + name, offx, length, misc = match.groups() + match = filelike.match(misc) + if match: + fn, obj = match.groups() + obj = obj.strip('()') if obj else None + offx, length = int(offx, 16), int(length, 16) + self[offx].add_obj(name, offx, length, fn, obj) + + +if __name__ == '__main__': + import argparse + parser = argparse.ArgumentParser(description='Parser GCC map file') + parser.add_argument('mapfile', type=argparse.FileType('r'), help='The GCC .map file to parse') + parser.add_argument('-m', '--memory', type=str, help='The memory segments to print, comma-separated') + args = parser.parse_args() + mf = MapFile(args.mapfile.read()) + args.mapfile.close() + + mems = args.memory.split(',') if args.memory else mf.memcfg.keys() + + for name in mems: + mem = mf.memcfg[name] + print('Symbols by file for memory', name) + for tot, fn in reversed(sorted( (tot, fn) for fn, tot in mem.totals.items() )): + print(' {:>8} {}'.format(tot, fn)) + for length, offx, sec, obj in reversed(sorted(( (length, offx, sec, obj) for sec, obj, offx, length in + mem.files[fn] ), key=lambda e: e[0] )): + name = sec.name if sec else None + print(' {:>8} {:>#08x} {}'.format(length, offx, obj)) + #print('{:>16} 0x{:016x} 0x{:016x} ({:>24}) {}'.format(name, origin, length, length, attrs)) + diff --git a/fw/tools/mapvis.py b/fw/tools/mapvis.py new file mode 100644 index 0000000..4a71222 --- /dev/null +++ b/fw/tools/mapvis.py @@ -0,0 +1,25 @@ +#!/usr/bin/env python3 + +from matplotlib import pyplot as plt + +f, ax = plt.subplots(1, figsize=(3, 8)) +bar_width = 1 + +ax.bar([-bar_width/2], top, bottom=bottom, width=bar_width, label='foo') +ax.set_xticks([0], [filename]) +ax.set_ylabel('Memory usage (B)') +ax.set_xlabel('') + +ax.set_xlim([-bar_width/2, bar_width/2]) +ax.set_ylim([0, mem_max]) + +if __name__ == '__main__': + import argparse + import mapparse + parser = argparse.ArgumentParser(description='Visualize program memory usage using GCC map file') + parser.add_argument('mapfile', type=argparse.FileType('r'), description='Input GCC .map file') + args = parser.parse_args() + + mapping = mapparse.MapFile(args.mapfile.read()) + mapping. + diff --git a/fw/tools/measure_transpose_performance.gdb b/fw/tools/measure_transpose_performance.gdb new file mode 100644 index 0000000..966d69f --- /dev/null +++ b/fw/tools/measure_transpose_performance.gdb @@ -0,0 +1,17 @@ +target remote localhost:3333 +file main.elf +load +set print pretty on +set pagination off +cont +print cvr/50.0F +cont +print cvr/50.0F +cont +print cvr/50.0F +cont +print cvr/50.0F +cont +print cvr/50.0F +cont +quit diff --git a/fw/tools/profile.gdb b/fw/tools/profile.gdb new file mode 100644 index 0000000..fd26540 --- /dev/null +++ b/fw/tools/profile.gdb @@ -0,0 +1,5 @@ +set pagination off +target remote localhost:3333 +while(1) + continue +end diff --git a/fw/tools/profile.sh b/fw/tools/profile.sh new file mode 100644 index 0000000..b209a14 --- /dev/null +++ b/fw/tools/profile.sh @@ -0,0 +1,26 @@ +#!/bin/sh +NLOOPS=1000 +SLEEP=0.1 + +[ $# -lt 1 ] && echo "ERROR: Not enough arguments" && exit 2 +elffile="$1" + +trap "exit" SIGINT + +logfile=$(mktemp) + +arm-none-eabi-gdb -x profile.gdb "$elffile" > "$logfile" 2>/dev/null& +gdbpid=$! +trap "kill -TERM $gdbpid; rm $logfile" EXIT +echo "Gathering..." +for i in $(seq 1 $NLOOPS); do + echo "$i/$NLOOPS" + kill -INT $gdbpid + sleep $SLEEP +done +kill -TERM $gdbpid +trap "rm '$logfile'" EXIT + +egrep -o '\w+ \(.*\) at .*' "$logfile" |cut -d' ' -f1|sort|uniq -c|sort -n +echo 'Total:' $(egrep -c '\w+ \(.*\) at .*' "$logfile") + diff --git a/fw/tools/pymapfile b/fw/tools/pymapfile new file mode 160000 index 0000000..7e0c9c4 --- /dev/null +++ b/fw/tools/pymapfile @@ -0,0 +1 @@ +Subproject commit 7e0c9c46ecd0b9dc7a679ed2d445bca63d096bea diff --git a/fw/tools/scans/digit.png b/fw/tools/scans/digit.png new file mode 100644 index 0000000..bfe9614 Binary files /dev/null and b/fw/tools/scans/digit.png differ diff --git a/fw/tools/scans/megumin_segmentmap_600dpi.jpg b/fw/tools/scans/megumin_segmentmap_600dpi.jpg new file mode 100644 index 0000000..8f8dbee Binary files /dev/null and b/fw/tools/scans/megumin_segmentmap_600dpi.jpg differ diff --git a/fw/tools/scans/pretty.jpg b/fw/tools/scans/pretty.jpg new file mode 100644 index 0000000..806a6ed Binary files /dev/null and b/fw/tools/scans/pretty.jpg differ diff --git a/fw/tools/scans/pretty.png b/fw/tools/scans/pretty.png new file mode 100644 index 0000000..47d6bfa Binary files /dev/null and b/fw/tools/scans/pretty.png differ diff --git a/fw/tools/scans/pretty2.png b/fw/tools/scans/pretty2.png new file mode 100644 index 0000000..353dcb6 Binary files /dev/null and b/fw/tools/scans/pretty2.png differ diff --git a/fw/tools/segmasks/seg1.png b/fw/tools/segmasks/seg1.png new file mode 100644 index 0000000..96abf0c Binary files /dev/null and b/fw/tools/segmasks/seg1.png differ diff --git a/fw/tools/segmasks/seg2.png b/fw/tools/segmasks/seg2.png new file mode 100644 index 0000000..be79d61 Binary files /dev/null and b/fw/tools/segmasks/seg2.png differ diff --git a/fw/tools/segmasks/seg3.png b/fw/tools/segmasks/seg3.png new file mode 100644 index 0000000..3d0715d Binary files /dev/null and b/fw/tools/segmasks/seg3.png differ diff --git a/fw/tools/segmasks/seg4.png b/fw/tools/segmasks/seg4.png new file mode 100644 index 0000000..b783f3c Binary files /dev/null and b/fw/tools/segmasks/seg4.png differ diff --git a/fw/tools/segmasks/seg5.png b/fw/tools/segmasks/seg5.png new file mode 100644 index 0000000..013fda8 Binary files /dev/null and b/fw/tools/segmasks/seg5.png differ diff --git a/fw/tools/segmasks/seg6.png b/fw/tools/segmasks/seg6.png new file mode 100644 index 0000000..08b45cc Binary files /dev/null and b/fw/tools/segmasks/seg6.png differ diff --git a/fw/tools/segmasks/seg7.png b/fw/tools/segmasks/seg7.png new file mode 100644 index 0000000..dcd4d0f Binary files /dev/null and b/fw/tools/segmasks/seg7.png differ diff --git a/fw/tools/segmasks/seg8.png b/fw/tools/segmasks/seg8.png new file mode 100644 index 0000000..1979630 Binary files /dev/null and b/fw/tools/segmasks/seg8.png differ diff --git a/fw/tools/test.py b/fw/tools/test.py new file mode 100755 index 0000000..63cb324 --- /dev/null +++ b/fw/tools/test.py @@ -0,0 +1,140 @@ +#!/usr/bin/env python3 +import serial +import struct +from itertools import takewhile + +def chunked(data, chunk_size): + for i in range(0, len(data), chunk_size): + yield data[i:i+chunk_size] + +def frame_packet(data): + if len(data) > 254: + raise ValueError('Input too long') + out = b'' + for run in data.split(b'\0'): + out += bytes([len(run)+1]) + out += run + out += b'\0' + return out + +def format_packet(data): + out = b'' + for a, b, c, d, e, f, g, h in chunked(data, 8): + ah, bh, ch, dh = a>>8, b>>8, c>>8, d>>8 + eh, fh, gh, hh = e>>8, f>>8, g>>8, h>>8 + al, bl, cl, dl = a&0xff, b&0xff, c&0xff, d&0xff + el, fl, gl, hl = e&0xff, f&0xff, g&0xff, h&0xff + # FIXME check order of high bits + out += bytes([al, bl, cl, dl, el, fl, gl, hl, + (ah<<6 | bh<<4 | ch<<2 | dh<<0)&0xff, + (eh<<6 | fh<<4 | gh<<2 | hh<<0)&0xff]) + out += bytes([1, 0, 0, 0]) # global intensity + return out + +def chariter(ser): + while True: + yield ser.read(1) + +def read_frame(ser): + return b''.join(takewhile(lambda c: c and c[0], chariter(ser))) + +def unstuff(data): + out = b'' + while data: + stuff = data[0] + if out: + out += b'\0' + out += data[1:stuff] + data = data[stuff:] + return out + +def receive_frame(ser): + return unstuff(read_frame(ser)) + +def mac_frame(mac): + return frame_packet(struct.pack(' +#include +#include +#include +#include + +#include "transpose.h" + +void rxbuf_dump(struct data_format *rx) { + fprintf(stdout, "\033[38;5;244m high | low\n"); + fprintf(stdout, " a b c d e f g . | a b c d e f g .\033[0m\n"); + + for (int i=0; i<32; i++) { + for (int j=0; j<8; j++) + fprintf(stdout, "%02x ", rx[i].high[j]); + fprintf(stdout, "\033[38;5;244m|\033[0m"); + for (int j=0; j<8; j++) + fprintf(stdout, " %1x", (rx[i].low>>(2*j))&0x3); + fprintf(stdout, "\n"); + } +} + +void fb_dump(struct framebuf *fb) { + fprintf(stdout, "\033[38;5;244mbit | "); + for (int i=0; i<8; i++) + fprintf(stdout, " %d ", i); + fprintf(stdout, "\033[0m\n"); + + for (int i=0; i<10; i++) { + fprintf(stdout, " %2d |", i); + for (int j=0; j<8; j++) + fprintf(stdout, " %08x", fb->frame[i].data[j]); + fprintf(stdout, "\n"); + } +} + +int main(int argc, char **argv) { + FILE *randf = fopen("/dev/urandom", "r"); + if (!randf) + return 2; + + struct framebuf *fb = malloc(sizeof(struct framebuf)); + if (!fb) + return 2; + assert(sizeof(*fb) == 32*sizeof(struct data_format)+4); + + uint8_t *rxbuf1 = malloc(sizeof(*fb)); + if (!rxbuf1) + return 2; + if (fread(rxbuf1, 1, sizeof(*fb), randf) != sizeof(*fb)) + return 2; + + uint8_t *rxbuf2 = malloc(sizeof(*fb)); + if (!rxbuf2) + return 2; + memcpy(rxbuf2, rxbuf1, sizeof(*fb)); + + memset((void *)fb, 0, sizeof(*fb)); + + transpose_data(rxbuf1, fb); + untranspose_data(fb, rxbuf1); + + assert(!memcmp(rxbuf1, rxbuf2, sizeof(fb))); + + fprintf(stdout, "\n\033[93mDUMP of ORIGINAL\033[0m\n"); + rxbuf_dump((struct data_format *)rxbuf2); + + fprintf(stdout, "\n\033[93mDUMP of FRAME BUFFER\033[0m\n"); + fb_dump(fb); + + fprintf(stdout, "\n\033[93mDUMP of RESULT\033[0m\n"); + rxbuf_dump((struct data_format *)rxbuf1); + + fprintf(stderr, "PASS"); + return 0; +} diff --git a/fw/transpose_main.c b/fw/transpose_main.c deleted file mode 100644 index 793872d..0000000 --- a/fw/transpose_main.c +++ /dev/null @@ -1,77 +0,0 @@ - -#include -#include -#include -#include -#include - -#include "transpose.h" - -void rxbuf_dump(struct data_format *rx) { - fprintf(stdout, "\033[38;5;244m high | low\n"); - fprintf(stdout, " a b c d e f g . | a b c d e f g .\033[0m\n"); - - for (int i=0; i<32; i++) { - for (int j=0; j<8; j++) - fprintf(stdout, "%02x ", rx[i].high[j]); - fprintf(stdout, "\033[38;5;244m|\033[0m"); - for (int j=0; j<8; j++) - fprintf(stdout, " %1x", (rx[i].low>>(2*j))&0x3); - fprintf(stdout, "\n"); - } -} - -void fb_dump(struct framebuf *fb) { - fprintf(stdout, "\033[38;5;244mbit | "); - for (int i=0; i<8; i++) - fprintf(stdout, " %d ", i); - fprintf(stdout, "\033[0m\n"); - - for (int i=0; i<10; i++) { - fprintf(stdout, " %2d |", i); - for (int j=0; j<8; j++) - fprintf(stdout, " %08x", fb->frame[i].data[j]); - fprintf(stdout, "\n"); - } -} - -int main(int argc, char **argv) { - FILE *randf = fopen("/dev/urandom", "r"); - if (!randf) - return 2; - - struct framebuf *fb = malloc(sizeof(struct framebuf)); - if (!fb) - return 2; - assert(sizeof(*fb) == 32*sizeof(struct data_format)+4); - - uint8_t *rxbuf1 = malloc(sizeof(*fb)); - if (!rxbuf1) - return 2; - if (fread(rxbuf1, 1, sizeof(*fb), randf) != sizeof(*fb)) - return 2; - - uint8_t *rxbuf2 = malloc(sizeof(*fb)); - if (!rxbuf2) - return 2; - memcpy(rxbuf2, rxbuf1, sizeof(*fb)); - - memset((void *)fb, 0, sizeof(*fb)); - - transpose_data(rxbuf1, fb); - untranspose_data(fb, rxbuf1); - - assert(!memcmp(rxbuf1, rxbuf2, sizeof(fb))); - - fprintf(stdout, "\n\033[93mDUMP of ORIGINAL\033[0m\n"); - rxbuf_dump((struct data_format *)rxbuf2); - - fprintf(stdout, "\n\033[93mDUMP of FRAME BUFFER\033[0m\n"); - fb_dump(fb); - - fprintf(stdout, "\n\033[93mDUMP of RESULT\033[0m\n"); - rxbuf_dump((struct data_format *)rxbuf1); - - fprintf(stderr, "PASS"); - return 0; -} -- cgit