From 0aae6aebfd2c1a2c5dbad176308314b084668d5f Mon Sep 17 00:00:00 2001 From: "D. Rimron-Soutter" Date: Tue, 7 Oct 2025 22:01:08 +0100 Subject: [PATCH] Trying to get a dokku build :) --- Dockerfile | 28 +++ .../{nextreg_bare.txt => nextreg_records.txt} | 8 +- docker-entrypoint.sh | 6 + src/app/favicon.ico | Bin 25931 -> 0 bytes src/app/globals.css | 9 + src/app/layout.tsx | 27 ++- src/app/page.tsx | 91 +-------- src/app/registers/RegisterBrowser.tsx | 70 ++++--- src/app/registers/RegisterDetailClient.tsx | 60 ++++++ src/app/registers/[hex]/page.tsx | 183 ++++++++++++++++++ src/app/registers/page.tsx | 47 ++++- src/app/registers/types.ts | 4 +- src/app/utils/parser.ts | 0 src/middleware.js | 12 ++ 14 files changed, 410 insertions(+), 135 deletions(-) create mode 100644 Dockerfile rename data/{nextreg_bare.txt => nextreg_records.txt} (99%) create mode 100644 docker-entrypoint.sh delete mode 100644 src/app/favicon.ico create mode 100644 src/app/registers/RegisterDetailClient.tsx create mode 100644 src/app/registers/[hex]/page.tsx create mode 100644 src/app/utils/parser.ts create mode 100644 src/middleware.js diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..789b271 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,28 @@ +FROM node:22.14.0-alpine + +WORKDIR /app + +# Install pnpm +RUN npm install -g pnpm + +# Copy package.json and pnpm-lock.yaml +COPY package.json pnpm-lock.yaml* ./ + +# Install dependencies +RUN pnpm install + +# Copy the rest of the application code +COPY . . + +# Create a volume mount point for sensitive data +VOLUME /app/data + +# Expose the port the app runs on +#EXPOSE 5000 + +# Create a startup script that initializes the database and starts the application +COPY docker-entrypoint.sh /app/ +RUN chmod +x /app/docker-entrypoint.sh + +# Command to run the startup script +CMD ["/app/docker-entrypoint.sh"] diff --git a/data/nextreg_bare.txt b/data/nextreg_records.txt similarity index 99% rename from data/nextreg_bare.txt rename to data/nextreg_records.txt index 187bff6..563a543 100644 --- a/data/nextreg_bare.txt +++ b/data/nextreg_records.txt @@ -1,10 +1,10 @@ 0x00 (00) => Machine ID (R) 0000 1000 = EMULATORS - +// 0000 1010 = ZX Spectrum Next 1111 1010 = ZX Spectrum Next Anti-brick - +// 1001 1010 = ZX Spectrum Next Core on UnAmiga Reloaded 1010 1010 = ZX Spectrum Next Core on UnAmiga 1011 1010 = ZX Spectrum Next Core on SiDi @@ -40,7 +40,7 @@ ** These signals are ignored if the multiface, divmmc, dma or external nmi master is active ** Copper cannot clear these bits ** An i/o trap could occur at the same time as mf / divmmc cause; always check this bit in nmi isr if important - + 0x03 (03) => Machine Type (R) bit 7 = nextreg 0x44 second byte indicator @@ -1234,6 +1234,4 @@ progress is made in the main program. bits 7:0 = MSB data connected to XADC DRP data bus D15:8 * DRP reads store result here, DRP writes take value from here --- - 0xFF (255) => Reserved for internal use diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh new file mode 100644 index 0000000..916e503 --- /dev/null +++ b/docker-entrypoint.sh @@ -0,0 +1,6 @@ +#!/bin/sh +set -e + +# Start the application +echo "Starting the application..." +exec pnpm start diff --git a/src/app/favicon.ico b/src/app/favicon.ico deleted file mode 100644 index 718d6fea4835ec2d246af9800eddb7ffb276240c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25931 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 LrJugUA?W`A8`#=m diff --git a/src/app/globals.css b/src/app/globals.css index a6f1d74..a3416ee 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -46,4 +46,13 @@ a { color: blue; margin-left: 4px; font-weight: bold; +} + +.bits-table th:first-child, +.bits-table td:first-child { + width: 120px; +} + +.bits-table td:last-child { + white-space: pre-wrap; } \ No newline at end of file diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 29dee48..b01ab5a 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,5 +1,6 @@ import type { Metadata } from "next"; import { Geist, Geist_Mono } from "next/font/google"; +import Link from 'next/link'; import "./globals.css"; import "bootstrap/dist/css/bootstrap.min.css"; @@ -14,8 +15,8 @@ const geistMono = Geist_Mono({ }); export const metadata: Metadata = { - title: "Create Next App", - description: "Generated by create next app", + title: "Spectrum Next Registers", + description: "A platform for exploring the Spectrum Next registers", }; export default function RootLayout({ @@ -26,7 +27,27 @@ export default function RootLayout({ return ( - {children} + +
+ {children} +
); diff --git a/src/app/page.tsx b/src/app/page.tsx index 627d25d..86aeddb 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,98 +1,15 @@ -import Image from "next/image"; import styles from "./page.module.css"; +import Link from 'next/link'; export default function Home() { return (
- Next.js logo -
    -
  1. - Get started by editing src/app/page.tsx. -
    2. -
  2. Save and see your changes instantly.
    3. -
  3. - Explore the Spectrum Next Registers. -
    4. -
- + + Register Explorer → +
-
); } diff --git a/src/app/registers/RegisterBrowser.tsx b/src/app/registers/RegisterBrowser.tsx index 7ec30b8..b6f6b9f 100644 --- a/src/app/registers/RegisterBrowser.tsx +++ b/src/app/registers/RegisterBrowser.tsx @@ -1,6 +1,7 @@ 'use client'; import { useState } from 'react'; +import Link from 'next/link'; import { Register, RegisterAccess, Note } from './types'; import { Form, Card, Container, Row, Col, Tabs, Tab, Table, OverlayTrigger, Tooltip } from 'react-bootstrap'; @@ -8,7 +9,7 @@ interface RegisterBrowserProps { registers: Register[]; } -function renderAccess(access: RegisterAccess) { +export function renderAccess(access: RegisterAccess) { const renderTooltip = (notes: Note[]) => ( {notes.map((note, index) => ( @@ -19,32 +20,35 @@ function renderAccess(access: RegisterAccess) { return ( <> - - - - - - - - - {access.operations.map((op, index) => { - const notes = access.notes.filter(note => note.ref === op.footnoteRef); - return ( - - - - - ); - })} - -
BitsDescription
{op.bits} - {op.description} - {op.footnoteRef && notes.length > 0 && ( - - {op.footnoteRef} - - )} -
+ {access.description && 
{access.description}
} + {access.operations.length > 0 && + + + + + + + + + {access.operations.map((op, index) => { + const notes = access.notes.filter(note => note.ref === op.footnoteRef); + return ( + + + + + ); + })} + +
BitsDescription
{op.bits} + {op.description} + {op.footnoteRef && notes.length > 0 && ( + + {op.footnoteRef} + + )} +
+ } {access.notes.map((note, index) => (

{note.ref} {note.text}

))} @@ -84,17 +88,25 @@ export default function RegisterBrowser({ registers }: RegisterBrowserProps) { - {register.name} ({register.hex_address} / {register.dec_address}) + {register.hex_address} ( {register.dec_address} ) + {register.name} {register.issue_4_only && Issue 4 Only} + - {register.common && {renderAccess(register.common)}} + {register.common && {renderAccess(register.common)}} {register.read && {renderAccess(register.read)}} {register.write && {renderAccess(register.write)}} {register.notes.map((note, index) => (

{note.ref} {note.text}

))} + {register.text && register.text.length > 0 && ( +
+
Notes:
+ 
{register.text}
+
+ )} diff --git a/src/app/registers/RegisterDetailClient.tsx b/src/app/registers/RegisterDetailClient.tsx new file mode 100644 index 0000000..2ebd692 --- /dev/null +++ b/src/app/registers/RegisterDetailClient.tsx @@ -0,0 +1,60 @@ +"use client"; + +import { Container, Row, Col, Card, Tabs, Tab } from 'react-bootstrap'; +import { Register } from './types'; +import { renderAccess } from './RegisterBrowser'; + +export default function RegisterDetailClient({ + register, + defaultActiveKey, +}: { + register: Register; + defaultActiveKey?: string; +}) { + return ( + + + + + + {register.name} ({register.hex_address} / {register.dec_address}){' '} + {register.issue_4_only && Issue 4 Only} + + + {defaultActiveKey ? ( + + {register.common && ( + + {renderAccess(register.common)} + + )} + {register.read && ( + + {renderAccess(register.read)} + + )} + {register.write && ( + + {renderAccess(register.write)} + + )} + + ) : null} + {register.notes.map((note, index) => ( +

+ {note.ref} {note.text} +

+ ))} + {register.text && register.text.length > 0 && ( +
+
Notes:
+ 
{register.text}
+
+ )} + + + + + + ); +} diff --git a/src/app/registers/[hex]/page.tsx b/src/app/registers/[hex]/page.tsx new file mode 100644 index 0000000..e148db4 --- /dev/null +++ b/src/app/registers/[hex]/page.tsx @@ -0,0 +1,183 @@ +import { promises as fs } from 'fs'; +import path from 'path'; +import { notFound } from 'next/navigation'; +import Link from 'next/link'; +import { Register, RegisterAccess } from '../../registers/types'; +import RegisterDetailClient from '../../registers/RegisterDetailClient'; + +async function parseNextReg(fileContent: string): Promise { + const registers: Register[] = []; + const paragraphs = fileContent.split(/\n\s*\n/); + + for (const paragraph of paragraphs) { + if (!paragraph.trim()) { + continue; + } + processRegisterBlock(paragraph, registers); + } + + return registers; +} + +function processRegisterBlock(paragraph: string, registers: Register[]) { + const lines = paragraph.trim().split('\n'); + const firstLine = lines[0]; + + const registerMatch = firstLine.match(/([0-9a-fA-F,x]+)\s*\((.*?)\)\s*=>\s*(.*)/); + + if (!registerMatch) { + return; + } + + const hexAddresses = registerMatch[1].trim(); + const decAddresses = registerMatch[2].trim(); + const name = registerMatch[3] ? registerMatch[3].trim() : ''; + const description = lines.slice(1).join('\n').trim(); + + const hexList = hexAddresses.split(',').map(h => h.trim()); + const decList = decAddresses.includes('-') ? decAddresses.split('-') : decAddresses.split(',').map(d => d.trim()); + + const createRegister = (hex: string, dec: string | number, regName: string): Register => { + const reg: Register = { + hex_address: hex, + dec_address: dec, + name: regName, + description: description, + notes: [], + text: "", + issue_4_only: false + }; + + const descriptionLines = description.split('\n'); + let currentAccess: 'read' | 'write' | 'common' | null = null; + let accessData: RegisterAccess = { operations: [], notes: [] }; + + for (const line of descriptionLines) { + if(line.includes('Issue 4 Only')) reg.issue_4_only = true; + + const trimmedLine = line.trim(); + + if (trimmedLine.startsWith('//')) continue; + + if (trimmedLine.startsWith('(R)')) { + if (currentAccess) reg[currentAccess] = accessData; + accessData = { operations: [], notes: [] }; + currentAccess = 'read'; + continue; + } + if (trimmedLine.startsWith('(W)')) { + if (currentAccess) reg[currentAccess] = accessData; + accessData = { operations: [], notes: [] }; + currentAccess = 'write'; + continue; + } + if (trimmedLine.startsWith('(R/W')) { + if (currentAccess) reg[currentAccess] = accessData; + accessData = { operations: [], notes: [] }; + currentAccess = 'common'; + continue; + } + if (line.startsWith(trimmedLine)) { + if (currentAccess) reg[currentAccess] = accessData; + accessData = { operations: [], notes: [] }; + currentAccess = null; + } + + if (currentAccess) { + const bitMatch = trimmedLine.match(/^(bits?|bit)\s+([\d:-]+)\s*=\s*(.*)/); + const valueMatch = !line.match(/^\s+/) && trimmedLine.match(/^([01\s]+)\s*=\s*(.*)/); + + if (bitMatch) { + let bitDescription = bitMatch[3]; + const footnoteMatch = bitDescription.match(/(\*+)$/); + let footnoteRef: string | undefined = undefined; + if (footnoteMatch) { + footnoteRef = footnoteMatch[1]; + bitDescription = bitDescription.substring(0, bitDescription.length - footnoteRef.length).trim(); + } + accessData.operations.push({ + bits: bitMatch[2], + description: bitDescription, + footnoteRef: footnoteRef, + }); + } else if (valueMatch) { + accessData.operations.push({ + bits: valueMatch[1].trim().replace(/\s/g, ''), + description: valueMatch[2].trim(), + }); + } else if (trimmedLine.startsWith('*')) { + const noteMatch = trimmedLine.match(/^(\*+)\s*(.*)/); + if (noteMatch) { + accessData.notes.push({ + ref: noteMatch[1], + text: noteMatch[2], + }); + } + } else if (trimmedLine) { + if (line.match(/^\s+/) && accessData.operations.length > 0) { + accessData.operations[accessData.operations.length - 1].description += `\n${line}`; + } else { + + if (!accessData.description) { + accessData.description = ''; + } + accessData.description += `\n${trimmedLine}`; + } + } + } else { + if (trimmedLine.startsWith('*')) { + const noteMatch = trimmedLine.match(/^(\*+)\s*(.*)/); + if (noteMatch) { + (reg as Register).notes.push({ + ref: noteMatch[1], + text: noteMatch[2], + }); + } + } + else { + reg.text += `${line}\n`; + } + } + } + if (currentAccess) { + (reg as Register)[currentAccess] = accessData; + } + + return reg; + }; + + if (hexList.length > 1) { + for (let i = 0; i < hexList.length; i++) { + const hexAddr = hexList[i]; + const decAddr = (decList as string[])[i] || decAddresses; + const dec = isNaN(parseInt(decAddr, 10)) ? (decAddr) : parseInt(decAddr, 10); + registers.push(createRegister(hexAddr, dec, `${name} (${hexAddr})`)); + } + } else { + const dec = isNaN(parseInt(decAddresses, 10)) ? (decAddresses) : parseInt(decAddresses, 10); + registers.push(createRegister(hexAddresses, dec, name)); + } +} + +export default async function RegisterDetailPage({ params }: { params: { hex: string } }) { + const filePath = path.join(process.cwd(), 'data', 'nextreg_records.txt'); + const fileContent = await fs.readFile(filePath, 'utf8'); + const registers = await parseNextReg(fileContent); + + const targetHex = decodeURIComponent((await params).hex).toLowerCase(); + + const register = registers.find(r => r.hex_address.toLowerCase() === targetHex); + + if (!register) return notFound(); + + const defaultActiveKey = register.common ? 'common' : (register.read ? 'read' : (register.write ? 'write' : undefined)); + + return ( +
+
+ ← Back to Registers +
+ +
+ ); +} diff --git a/src/app/registers/page.tsx b/src/app/registers/page.tsx index 07f87ce..e1651f5 100644 --- a/src/app/registers/page.tsx +++ b/src/app/registers/page.tsx @@ -42,6 +42,8 @@ function processRegisterBlock(paragraph: string, registers: Register[]) { name: regName, description: description, notes: [], + text: "", + issue_4_only: false }; const descriptionLines = description.split('\n'); @@ -49,28 +51,40 @@ function processRegisterBlock(paragraph: string, registers: Register[]) { let accessData: RegisterAccess = { operations: [], notes: [] }; for (const line of descriptionLines) { + if(line.includes('Issue 4 Only')) reg.issue_4_only = true; + const trimmedLine = line.trim(); - if (trimmedLine === '(R)') { + + if (trimmedLine.startsWith('//')) continue; + + if (trimmedLine.startsWith('(R)')) { if (currentAccess) reg[currentAccess] = accessData; accessData = { operations: [], notes: [] }; currentAccess = 'read'; continue; } - if (trimmedLine === '(W)') { + if (trimmedLine.startsWith('(W)')) { if (currentAccess) reg[currentAccess] = accessData; accessData = { operations: [], notes: [] }; currentAccess = 'write'; continue; } - if (trimmedLine === '(R/W)') { + if (trimmedLine.startsWith('(R/W')) { if (currentAccess) reg[currentAccess] = accessData; accessData = { operations: [], notes: [] }; currentAccess = 'common'; continue; } + if (line.startsWith(trimmedLine)) { + if (currentAccess) reg[currentAccess] = accessData; + accessData = { operations: [], notes: [] }; + currentAccess = null; + } if (currentAccess) { const bitMatch = trimmedLine.match(/^(bits?|bit)\s+([\d:-]+)\s*=\s*(.*)/); + const valueMatch = !line.match(/^\s+/) && trimmedLine.match(/^([01\s]+)\s*=\s*(.*)/); + if (bitMatch) { let bitDescription = bitMatch[3]; const footnoteMatch = bitDescription.match(/(\*+)$/); @@ -84,6 +98,11 @@ function processRegisterBlock(paragraph: string, registers: Register[]) { description: bitDescription, footnoteRef: footnoteRef, }); + } else if (valueMatch) { + accessData.operations.push({ + bits: valueMatch[1].trim().replace(/\s/g, ''), + description: valueMatch[2].trim(), + }); } else if (trimmedLine.startsWith('*')) { const noteMatch = trimmedLine.match(/^(\*+)\s*(.*)/); if (noteMatch) { @@ -92,10 +111,16 @@ function processRegisterBlock(paragraph: string, registers: Register[]) { text: noteMatch[2], }); } - } else if(trimmedLine) { - if(accessData.operations.length > 0) { - accessData.operations[accessData.operations.length-1].description += `\n${trimmedLine}`; + } else if (trimmedLine) { + if (line.match(/^\s+/) && accessData.operations.length > 0) { + accessData.operations[accessData.operations.length - 1].description += `\n${line}`; + } else { + + if (!accessData.description) { + accessData.description = ''; } + accessData.description += `\n${trimmedLine}`; + } } } else { if (trimmedLine.startsWith('*')) { @@ -107,6 +132,9 @@ function processRegisterBlock(paragraph: string, registers: Register[]) { }); } } + else { + reg.text += `${line}\n`; + } } } if (currentAccess) { @@ -130,18 +158,17 @@ function processRegisterBlock(paragraph: string, registers: Register[]) { } -import { Container } from 'react-bootstrap'; export default async function RegistersPage() { - const filePath = path.join(process.cwd(), 'data', 'nextreg_bare.txt'); + const filePath = path.join(process.cwd(), 'data', 'nextreg_records.txt'); const fileContent = await fs.readFile(filePath, 'utf8'); const registers = await parseNextReg(fileContent); return ( - +

Spectrum Next Registers

- +
); } diff --git a/src/app/registers/types.ts b/src/app/registers/types.ts index 89eb6fb..5ff646a 100644 --- a/src/app/registers/types.ts +++ b/src/app/registers/types.ts @@ -11,10 +11,10 @@ } export interface RegisterAccess { + description?: string; operations: BitwiseOperation[]; notes: Note[]; } - export interface Register { hex_address: string; dec_address: number | string; @@ -23,5 +23,7 @@ read?: RegisterAccess; write?: RegisterAccess; common?: RegisterAccess; + text: string; notes: Note[]; + issue_4_only: boolean; } diff --git a/src/app/utils/parser.ts b/src/app/utils/parser.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/middleware.js b/src/middleware.js new file mode 100644 index 0000000..f77cc69 --- /dev/null +++ b/src/middleware.js @@ -0,0 +1,12 @@ +import { NextResponse } from 'next/server' + +export function middleware(request) { + const { method, nextUrl } = request + + // Filter out internal Next.js assets if desired + if (!nextUrl.pathname.startsWith('/_next')) { + console.log(`${method} ${nextUrl.pathname}`) + } + + return NextResponse.next() +} \ No newline at end of file