feat: add bootsector generation option

Mati365 · Mati365 · commit 9a560859bfab · 2023-10-29T16:49:01.000+01:00
diff --git a/README.md b/README.md
@@ -37,6 +37,7 @@ Options:
   -o, --output <string>  Relative path to your output binary
   -ps, --print-assembly  Print assembly output
   -d, --debug            Print AST tree and assembly output
+  -b, --bootsector       Generate 512B bootsector output. Remember to have main entrypoint.
   -h, --help             display help for command
 ```
 
diff --git a/apps/cli/CHANGELOG.md b/apps/cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @ts-c-compiler/cli
 
+## 1.0.1
+
+### Patch Changes
+
+- Add bootsector output option
+
 ## 1.0.0
 
 ### Major Changes
diff --git a/apps/cli/package.json b/apps/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ts-c-compiler/cli",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "private": false,
   "license": "MIT",
   "scripts": {
diff --git a/apps/cli/src/index.ts b/apps/cli/src/index.ts
@@ -2,13 +2,21 @@ import fs from 'node:fs';
 import { program } from '@commander-js/extra-typings';
 
 import { TableBinaryView, asm } from '@ts-c-compiler/x86-assembler';
-import { ccompiler, serializeTypedTreeToString } from '@ts-c-compiler/compiler';
+import {
+  ccompiler,
+  serializeTypedTreeToString,
+  wrapWithX86BootsectorAsm,
+} from '@ts-c-compiler/compiler';
 
 program
   .argument('<source>', 'Relative or absolute path to source file')
   .option('-o, --output <string>', 'Relative path to your output binary')
   .option('-ps, --print-assembly', 'Print assembly output')
   .option('-d, --debug', 'Print AST tree and assembly output')
+  .option(
+    '-b, --bootsector',
+    'Generate 512B bootsector output. Remember to have main entrypoint.',
+  )
   .action((source, options) => {
     const srcFile = fs.readFileSync(source, { encoding: 'utf8', flag: 'r' });
 
@@ -18,7 +26,13 @@ program
           result.dump();
         }
 
-        const asmResult = asm(result.codegen.asm, {
+        let asmRaw = result.codegen.asm;
+
+        if (options.bootsector) {
+          asmRaw = wrapWithX86BootsectorAsm(asmRaw);
+        }
+
+        const asmResult = asm(asmRaw, {
           preprocessor: true,
         });
 
diff --git a/packages/compiler-core/CHANGELOG.md b/packages/compiler-core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @ts-c-compiler/core
 
+## 1.0.1
+
+### Patch Changes
+
+- Add bootsector output option
+
 ## 1.0.0
 
 ### Major Changes
diff --git a/packages/compiler-core/package.json b/packages/compiler-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ts-c-compiler/core",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "private": true,
   "license": "MIT",
diff --git a/packages/compiler-grammar/CHANGELOG.md b/packages/compiler-grammar/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @ts-c-compiler/grammar
 
+## 1.0.1
+
+### Patch Changes
+
+- Add bootsector output option
+- Updated dependencies
+  - @ts-c-compiler/core@1.0.1
+  - @ts-c-compiler/lexer@1.0.1
+
 ## 1.0.0
 
 ### Major Changes
diff --git a/packages/compiler-grammar/package.json b/packages/compiler-grammar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ts-c-compiler/grammar",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "private": true,
   "license": "MIT",
diff --git a/packages/compiler-lexer/CHANGELOG.md b/packages/compiler-lexer/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @ts-c-compiler/lexer
 
+## 1.0.1
+
+### Patch Changes
+
+- Add bootsector output option
+- Updated dependencies
+  - @ts-c-compiler/core@1.0.1
+
 ## 1.0.0
 
 ### Major Changes
diff --git a/packages/compiler-lexer/package.json b/packages/compiler-lexer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ts-c-compiler/lexer",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "private": true,
   "license": "MIT",
diff --git a/packages/compiler-pico-c/CHANGELOG.md b/packages/compiler-pico-c/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @ts-c-compiler/compiler
 
+## 1.0.1
+
+### Patch Changes
+
+- Add bootsector output option
+- Updated dependencies
+  - @ts-c-compiler/core@1.0.1
+  - @ts-c-compiler/lexer@1.0.1
+  - @ts-c-compiler/rpn@1.0.1
+  - @ts-c-compiler/x86-assembler@1.0.1
+
 ## 1.0.0
 
 ### Major Changes
diff --git a/packages/compiler-pico-c/package.json b/packages/compiler-pico-c/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ts-c-compiler/compiler",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "private": false,
   "license": "MIT",
diff --git a/packages/compiler-pico-c/src/arch/index.ts b/packages/compiler-pico-c/src/arch/index.ts
@@ -1,6 +1,7 @@
 import { CCompilerArch } from '../constants';
 import { CArchDescriptor } from './types';
 
+export * from './x86/asm-utils';
 import * as X86_16 from './x86/modes/16bit/sizeofPrimitiveType';
 
 const COMPILER_ARCH_DESCRIPTORS: Record<
diff --git a/packages/compiler-pico-c/src/arch/x86/asm-utils/index.ts b/packages/compiler-pico-c/src/arch/x86/asm-utils/index.ts
@@ -3,3 +3,4 @@ export * from './genDefConst';
 export * from './genInstruction';
 export * from './genLabel';
 export * from './genMemAddress';
+export * from './wrapWithX86BootsectorAsm';
diff --git a/packages/compiler-pico-c/src/arch/x86/asm-utils/wrapWithX86BootsectorAsm.ts b/packages/compiler-pico-c/src/arch/x86/asm-utils/wrapWithX86BootsectorAsm.ts
@@ -0,0 +1,17 @@
+export const wrapWithX86BootsectorAsm = (code: string) => `
+  [org 0x7c00]
+  jmp 0x0000:initialize_mbr
+
+  initialize_mbr:
+    xor ax, ax
+    mov ds, ax
+    mov es, ax
+    mov fs, ax
+    call @@_fn_main
+    hlt
+
+  ${code}
+
+  times 510 - ($ - $$) db 0
+  dw 0xaa55
+`;
diff --git a/packages/compiler-pico-c/src/arch/x86/index.ts b/packages/compiler-pico-c/src/arch/x86/index.ts
@@ -1 +1,2 @@
+export * from './asm-utils';
 export * from './backend/X86ArchBackend';
diff --git a/packages/compiler-rpn/CHANGELOG.md b/packages/compiler-rpn/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @ts-c-compiler/rpn
 
+## 1.0.1
+
+### Patch Changes
+
+- Add bootsector output option
+- Updated dependencies
+  - @ts-c-compiler/core@1.0.1
+  - @ts-c-compiler/lexer@1.0.1
+
 ## 1.0.0
 
 ### Major Changes
diff --git a/packages/compiler-rpn/package.json b/packages/compiler-rpn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ts-c-compiler/rpn",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "private": true,
   "license": "MIT",
diff --git a/packages/x86-assembler/CHANGELOG.md b/packages/x86-assembler/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @ts-c-compiler/x86-assembler
 
+## 1.0.1
+
+### Patch Changes
+
+- Add bootsector output option
+- Updated dependencies
+  - @ts-c-compiler/core@1.0.1
+  - @ts-c-compiler/grammar@1.0.1
+  - @ts-c-compiler/lexer@1.0.1
+  - @ts-c-compiler/rpn@1.0.1
+
 ## 1.0.0
 
 ### Major Changes
diff --git a/packages/x86-assembler/package.json b/packages/x86-assembler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ts-c-compiler/x86-assembler",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "private": false,
   "license": "MIT",
diff --git a/packages/x86-cpu/CHANGELOG.md b/packages/x86-cpu/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @ts-c-compiler/x86-cpu
 
+## 1.0.1
+
+### Patch Changes
+
+- Add bootsector output option
+- Updated dependencies
+  - @ts-c-compiler/x86-assembler@1.0.1
+
 ## 1.0.0
 
 ### Major Changes
diff --git a/packages/x86-cpu/package.json b/packages/x86-cpu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ts-c-compiler/x86-cpu",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "private": true,
   "license": "MIT",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ts-c-compiler/cli",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"private": false,`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ts-c-compiler/core",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ts-c-compiler/grammar",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ts-c-compiler/lexer",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ts-c-compiler/compiler",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": false,`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+export * from './asm-utils';`
`1`	`2`	`export * from './backend/X86ArchBackend';`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ts-c-compiler/rpn",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ts-c-compiler/x86-assembler",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": false,`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ts-c-compiler/x86-cpu",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"private": true,`
`6`	`6`	`"license": "MIT",`