diff --git a/disks/pcx86/library.xml b/disks/pcx86/library.xml
index cc698bb3c..a668ff566 100644
--- a/disks/pcx86/library.xml
+++ b/disks/pcx86/library.xml
@@ -105,7 +105,7 @@
- VGA Tests (Black Book)
+ VGA Tests (Black Book)
Load
Save
diff --git a/tests/pc/trace/trace.com b/tests/pc/trace/trace.com
deleted file mode 100644
index c32f98f61..000000000
Binary files a/tests/pc/trace/trace.com and /dev/null differ
diff --git a/tests/pc/.gitignore b/tests/pcx86/.gitignore
similarity index 100%
rename from tests/pc/.gitignore
rename to tests/pcx86/.gitignore
diff --git a/tests/pc/80386/README.md b/tests/pcx86/80386/README.md
similarity index 56%
rename from tests/pc/80386/README.md
rename to tests/pcx86/80386/README.md
index 5761c6f0a..2f25606c5 100644
--- a/tests/pc/80386/README.md
+++ b/tests/pcx86/80386/README.md
@@ -1,7 +1,9 @@
---
layout: page
title: 80386 Tests
-permalink: /tests/pc/80386/
+permalink: /tests/pcx86/80386/
+redirect_from:
+ - /tests/pc/80386/
---
Overview
diff --git a/tests/pc/80386/makefile b/tests/pcx86/80386/makefile
similarity index 100%
rename from tests/pc/80386/makefile
rename to tests/pcx86/80386/makefile
diff --git a/tests/pc/80386/test386.asm b/tests/pcx86/80386/test386.asm
similarity index 99%
rename from tests/pc/80386/test386.asm
rename to tests/pcx86/80386/test386.asm
index 212ce82cf..d54692639 100644
--- a/tests/pc/80386/test386.asm
+++ b/tests/pcx86/80386/test386.asm
@@ -38,7 +38,7 @@
; The code which attempts to update myGDT and addrGDT will have no effect when installed as a ROM,
; which is fine, because those data structures are predefined with appropriate ROM-based addresses.
;
-; See the machine definition file in /modules/pcjs/bin/test386.json for a configuration that can
+; See the machine definition file in /modules/pcx86/bin/test386.json for a configuration that can
; load this file as a ROM image.
;
; REAL32 Notes
diff --git a/tests/pc/80386/test386.json b/tests/pcx86/80386/test386.json
similarity index 100%
rename from tests/pc/80386/test386.json
rename to tests/pcx86/80386/test386.json
diff --git a/tests/pc/80386/test386.txt b/tests/pcx86/80386/test386.txt
similarity index 100%
rename from tests/pc/80386/test386.txt
rename to tests/pcx86/80386/test386.txt
diff --git a/tests/pc/README.md b/tests/pcx86/README.md
similarity index 57%
rename from tests/pc/README.md
rename to tests/pcx86/README.md
index 2ddd4684d..1e3003230 100644
--- a/tests/pc/README.md
+++ b/tests/pcx86/README.md
@@ -1,11 +1,13 @@
---
layout: page
title: PC Test Resources
-permalink: /tests/pc/
+permalink: /tests/pcx86/
+redirect_from:
+ - /tests/pc/
---
-PC Test Resources
----
+PCx86 Test Resources
+--------------------
* [80386 Tests](80386/)
* [Trace Utility](trace/)
diff --git a/tests/pc/cpu/cpuid.asm b/tests/pcx86/cpu/cpuid.asm
similarity index 100%
rename from tests/pc/cpu/cpuid.asm
rename to tests/pcx86/cpu/cpuid.asm
diff --git a/tests/pc/exec/exec.asm b/tests/pcx86/exec/exec.asm
similarity index 100%
rename from tests/pc/exec/exec.asm
rename to tests/pcx86/exec/exec.asm
diff --git a/tests/pc/inc/dos.inc b/tests/pcx86/inc/dos.inc
similarity index 100%
rename from tests/pc/inc/dos.inc
rename to tests/pcx86/inc/dos.inc
diff --git a/tests/pc/inc/misc.inc b/tests/pcx86/inc/misc.inc
similarity index 100%
rename from tests/pc/inc/misc.inc
rename to tests/pcx86/inc/misc.inc
diff --git a/tests/pc/inc/x86.inc b/tests/pcx86/inc/x86.inc
similarity index 100%
rename from tests/pc/inc/x86.inc
rename to tests/pcx86/inc/x86.inc
diff --git a/tests/pc/trace/README.md b/tests/pcx86/trace/README.md
similarity index 86%
rename from tests/pc/trace/README.md
rename to tests/pcx86/trace/README.md
index 663dc52f4..09d111ff5 100644
--- a/tests/pc/trace/README.md
+++ b/tests/pcx86/trace/README.md
@@ -1,10 +1,12 @@
---
layout: page
title: PC Trace Utility
-permalink: /tests/pc/trace/
+permalink: /tests/pcx86/trace/
+redirect_from:
+ - /tests/pc/trace/
---
-WARNING: This utility is obsolete. It has been superseded by [test386](/tests/pc/80386/),
+WARNING: This utility is obsolete. It has been superseded by [test386](/tests/pcx86/80386/),
which, going forward, serves as our new model for instruction-level testing. As a result,
the **traceLog()** functionality mentioned below has been removed from the PCjs source code
(but you can always dig it back up if you really want it).
@@ -43,15 +45,15 @@ every time the machine is loaded, via the DiskDump API. This is useful when you
generating new test results:
```xml
-
+
```
Alternatively, if you want to run the tests in another virtual PC environment (eg, VMware Fusion),
you can create an IMG disk image from a directory using DiskDump's command-line interface:
- cd ~/Sites/pcjs/tests/pc
- node ~/Sites/pcjs/modules/diskdump/bin/diskdump --dir=trace --format=img --output=trace.img
+ cd tests/pcx86
+ node ../../modules/diskdump/bin/diskdump --dir=trace --format=img --output=trace.img
OS X users can also create an ISO image like so:
- hdiutil makehybrid -o ~/Sites/pcjs/tests/pc/trace.iso ~/Sites/pcjs/tests/pc/trace -iso -joliet
+ hdiutil makehybrid -o tests/pcx86/trace.iso tests/pcx86/trace -iso -joliet
diff --git a/tests/pc/trace/makefile b/tests/pcx86/trace/makefile
similarity index 100%
rename from tests/pc/trace/makefile
rename to tests/pcx86/trace/makefile
diff --git a/tests/pc/trace/trace.nasm b/tests/pcx86/trace/trace.nasm
similarity index 100%
rename from tests/pc/trace/trace.nasm
rename to tests/pcx86/trace/trace.nasm
diff --git a/tests/pc/trace/trace.txt b/tests/pcx86/trace/trace.txt
similarity index 100%
rename from tests/pc/trace/trace.txt
rename to tests/pcx86/trace/trace.txt
diff --git a/tests/pc/vga/L23-1.ASM b/tests/pcx86/vga/L23-1.ASM
similarity index 100%
rename from tests/pc/vga/L23-1.ASM
rename to tests/pcx86/vga/L23-1.ASM
diff --git a/tests/pc/vga/L24-1.ASM b/tests/pcx86/vga/L24-1.ASM
similarity index 100%
rename from tests/pc/vga/L24-1.ASM
rename to tests/pcx86/vga/L24-1.ASM
diff --git a/tests/pc/vga/L25-1.ASM b/tests/pcx86/vga/L25-1.ASM
similarity index 100%
rename from tests/pc/vga/L25-1.ASM
rename to tests/pcx86/vga/L25-1.ASM
diff --git a/tests/pc/vga/L25-2.ASM b/tests/pcx86/vga/L25-2.ASM
similarity index 100%
rename from tests/pc/vga/L25-2.ASM
rename to tests/pcx86/vga/L25-2.ASM
diff --git a/tests/pc/vga/L25-3.ASM b/tests/pcx86/vga/L25-3.ASM
similarity index 100%
rename from tests/pc/vga/L25-3.ASM
rename to tests/pcx86/vga/L25-3.ASM
diff --git a/tests/pc/vga/L25-4.ASM b/tests/pcx86/vga/L25-4.ASM
similarity index 100%
rename from tests/pc/vga/L25-4.ASM
rename to tests/pcx86/vga/L25-4.ASM
diff --git a/tests/pc/vga/L26-1.ASM b/tests/pcx86/vga/L26-1.ASM
similarity index 100%
rename from tests/pc/vga/L26-1.ASM
rename to tests/pcx86/vga/L26-1.ASM
diff --git a/tests/pc/vga/L26-2.ASM b/tests/pcx86/vga/L26-2.ASM
similarity index 100%
rename from tests/pc/vga/L26-2.ASM
rename to tests/pcx86/vga/L26-2.ASM
diff --git a/tests/pc/vga/L27-1.ASM b/tests/pcx86/vga/L27-1.ASM
similarity index 100%
rename from tests/pc/vga/L27-1.ASM
rename to tests/pcx86/vga/L27-1.ASM
diff --git a/tests/pc/vga/L27-2.ASM b/tests/pcx86/vga/L27-2.ASM
similarity index 100%
rename from tests/pc/vga/L27-2.ASM
rename to tests/pcx86/vga/L27-2.ASM
diff --git a/tests/pc/vga/L27-3.ASM b/tests/pcx86/vga/L27-3.ASM
similarity index 100%
rename from tests/pc/vga/L27-3.ASM
rename to tests/pcx86/vga/L27-3.ASM
diff --git a/tests/pc/vga/L28-1.ASM b/tests/pcx86/vga/L28-1.ASM
similarity index 100%
rename from tests/pc/vga/L28-1.ASM
rename to tests/pcx86/vga/L28-1.ASM
diff --git a/tests/pc/vga/L28-2.ASM b/tests/pcx86/vga/L28-2.ASM
similarity index 100%
rename from tests/pc/vga/L28-2.ASM
rename to tests/pcx86/vga/L28-2.ASM
diff --git a/tests/pc/vga/L28-3.ASM b/tests/pcx86/vga/L28-3.ASM
similarity index 100%
rename from tests/pc/vga/L28-3.ASM
rename to tests/pcx86/vga/L28-3.ASM
diff --git a/tests/pc/vga/L29-1.ASM b/tests/pcx86/vga/L29-1.ASM
similarity index 100%
rename from tests/pc/vga/L29-1.ASM
rename to tests/pcx86/vga/L29-1.ASM
diff --git a/tests/pc/vga/L29-2.ASM b/tests/pcx86/vga/L29-2.ASM
similarity index 100%
rename from tests/pc/vga/L29-2.ASM
rename to tests/pcx86/vga/L29-2.ASM
diff --git a/tests/pc/vga/L29-3.ASM b/tests/pcx86/vga/L29-3.ASM
similarity index 100%
rename from tests/pc/vga/L29-3.ASM
rename to tests/pcx86/vga/L29-3.ASM
diff --git a/tests/pc/vga/L29-4.ASM b/tests/pcx86/vga/L29-4.ASM
similarity index 100%
rename from tests/pc/vga/L29-4.ASM
rename to tests/pcx86/vga/L29-4.ASM
diff --git a/tests/pc/vga/L30-1.ASM b/tests/pcx86/vga/L30-1.ASM
similarity index 100%
rename from tests/pc/vga/L30-1.ASM
rename to tests/pcx86/vga/L30-1.ASM
diff --git a/tests/pc/vga/L30-2.ASM b/tests/pcx86/vga/L30-2.ASM
similarity index 100%
rename from tests/pc/vga/L30-2.ASM
rename to tests/pcx86/vga/L30-2.ASM
diff --git a/tests/pc/vga/L31-1.ASM b/tests/pcx86/vga/L31-1.ASM
similarity index 100%
rename from tests/pc/vga/L31-1.ASM
rename to tests/pcx86/vga/L31-1.ASM
diff --git a/tests/pc/vga/L31-2.ASM b/tests/pcx86/vga/L31-2.ASM
similarity index 100%
rename from tests/pc/vga/L31-2.ASM
rename to tests/pcx86/vga/L31-2.ASM
diff --git a/tests/pc/vga/L32-1.ASM b/tests/pcx86/vga/L32-1.ASM
similarity index 100%
rename from tests/pc/vga/L32-1.ASM
rename to tests/pcx86/vga/L32-1.ASM
diff --git a/tests/pc/vga/L32-2.C b/tests/pcx86/vga/L32-2.C
similarity index 100%
rename from tests/pc/vga/L32-2.C
rename to tests/pcx86/vga/L32-2.C
diff --git a/tests/pc/vga/L33-1.ASM b/tests/pcx86/vga/L33-1.ASM
similarity index 100%
rename from tests/pc/vga/L33-1.ASM
rename to tests/pcx86/vga/L33-1.ASM
diff --git a/tests/pc/vga/L34-1.ASM b/tests/pcx86/vga/L34-1.ASM
similarity index 100%
rename from tests/pc/vga/L34-1.ASM
rename to tests/pcx86/vga/L34-1.ASM
diff --git a/tests/pc/vga/L35-1.C b/tests/pcx86/vga/L35-1.C
similarity index 100%
rename from tests/pc/vga/L35-1.C
rename to tests/pcx86/vga/L35-1.C
diff --git a/tests/pc/vga/L35-2.C b/tests/pcx86/vga/L35-2.C
similarity index 100%
rename from tests/pc/vga/L35-2.C
rename to tests/pcx86/vga/L35-2.C
diff --git a/tests/pc/vga/L35-3.ASM b/tests/pcx86/vga/L35-3.ASM
similarity index 100%
rename from tests/pc/vga/L35-3.ASM
rename to tests/pcx86/vga/L35-3.ASM
diff --git a/tests/pc/vga/L42-1.C b/tests/pcx86/vga/L42-1.C
similarity index 100%
rename from tests/pc/vga/L42-1.C
rename to tests/pcx86/vga/L42-1.C
diff --git a/tests/pc/vga/L42-2.C b/tests/pcx86/vga/L42-2.C
similarity index 100%
rename from tests/pc/vga/L42-2.C
rename to tests/pcx86/vga/L42-2.C
diff --git a/tests/pc/vga/L42-3.C b/tests/pcx86/vga/L42-3.C
similarity index 100%
rename from tests/pc/vga/L42-3.C
rename to tests/pcx86/vga/L42-3.C
diff --git a/tests/pc/vga/L42-4.C b/tests/pcx86/vga/L42-4.C
similarity index 100%
rename from tests/pc/vga/L42-4.C
rename to tests/pcx86/vga/L42-4.C
diff --git a/tests/pc/vga/L42-5.C b/tests/pcx86/vga/L42-5.C
similarity index 100%
rename from tests/pc/vga/L42-5.C
rename to tests/pcx86/vga/L42-5.C
diff --git a/tests/pc/vga/L42-6.ASM b/tests/pcx86/vga/L42-6.ASM
similarity index 100%
rename from tests/pc/vga/L42-6.ASM
rename to tests/pcx86/vga/L42-6.ASM
diff --git a/tests/pc/vga/L47-1.ASM b/tests/pcx86/vga/L47-1.ASM
similarity index 100%
rename from tests/pc/vga/L47-1.ASM
rename to tests/pcx86/vga/L47-1.ASM
diff --git a/tests/pc/vga/L47-2.ASM b/tests/pcx86/vga/L47-2.ASM
similarity index 100%
rename from tests/pc/vga/L47-2.ASM
rename to tests/pcx86/vga/L47-2.ASM
diff --git a/tests/pc/vga/L47-3.ASM b/tests/pcx86/vga/L47-3.ASM
similarity index 100%
rename from tests/pc/vga/L47-3.ASM
rename to tests/pcx86/vga/L47-3.ASM
diff --git a/tests/pc/vga/L47-4.ASM b/tests/pcx86/vga/L47-4.ASM
similarity index 100%
rename from tests/pc/vga/L47-4.ASM
rename to tests/pcx86/vga/L47-4.ASM
diff --git a/tests/pc/vga/L47-5.ASM b/tests/pcx86/vga/L47-5.ASM
similarity index 100%
rename from tests/pc/vga/L47-5.ASM
rename to tests/pcx86/vga/L47-5.ASM
diff --git a/tests/pc/vga/L47-6.ASM b/tests/pcx86/vga/L47-6.ASM
similarity index 100%
rename from tests/pc/vga/L47-6.ASM
rename to tests/pcx86/vga/L47-6.ASM
diff --git a/tests/pc/vga/L47-7.C b/tests/pcx86/vga/L47-7.C
similarity index 100%
rename from tests/pc/vga/L47-7.C
rename to tests/pcx86/vga/L47-7.C
diff --git a/tests/pc/vga/L48-1.C b/tests/pcx86/vga/L48-1.C
similarity index 100%
rename from tests/pc/vga/L48-1.C
rename to tests/pcx86/vga/L48-1.C
diff --git a/tests/pc/vga/L48-2.ASM b/tests/pcx86/vga/L48-2.ASM
similarity index 100%
rename from tests/pc/vga/L48-2.ASM
rename to tests/pcx86/vga/L48-2.ASM
diff --git a/tests/pc/vga/L48-3.ASM b/tests/pcx86/vga/L48-3.ASM
similarity index 100%
rename from tests/pc/vga/L48-3.ASM
rename to tests/pcx86/vga/L48-3.ASM
diff --git a/tests/pc/vga/L48-4.ASM b/tests/pcx86/vga/L48-4.ASM
similarity index 100%
rename from tests/pc/vga/L48-4.ASM
rename to tests/pcx86/vga/L48-4.ASM
diff --git a/tests/pc/vga/MAKEFILE b/tests/pcx86/vga/MAKEFILE
similarity index 100%
rename from tests/pc/vga/MAKEFILE
rename to tests/pcx86/vga/MAKEFILE
diff --git a/tests/pc/vga/README.md b/tests/pcx86/vga/README.md
similarity index 97%
rename from tests/pc/vga/README.md
rename to tests/pcx86/vga/README.md
index d219a6912..fec9ab847 100644
--- a/tests/pc/vga/README.md
+++ b/tests/pcx86/vga/README.md
@@ -1,7 +1,9 @@
---
layout: page
title: VGA "Black Book" Tests
-permalink: /tests/pc/vga/
+permalink: /tests/pcx86/vga/
+redirect_from:
+ - /tests/pc/vga/
machines:
- type: pcx86
id: deskpro386
@@ -11,7 +13,7 @@ machines:
A:
path: /disks/pcx86/dos/compaq/3.31/COMPAQ-DOS331-DISK2.json
B:
- path: /tests/pc/vga/VGABIN.json
+ path: /tests/pcx86/vga/VGABIN.json
---
VGA "Black Book" Tests
@@ -100,7 +102,7 @@ Also, I've updated the PCjs [Library](/disks/pcx86/library.xml) disk collection
built from the sources in this directory:
```xml
-VGA Tests (Black Book)
+VGA Tests (Black Book)
```
The "VGA Tests (Black Book)" disk image (VGABIN) was built with this command:
@@ -113,7 +115,7 @@ the files in that directory (including any subdirectories) every time that disk
burden on the server, it's best to do this only when running PCjs from a local PCjs web server.
```xml
-VGA Tests (Black Book)
+VGA Tests (Black Book)
```
One advantage of using [DiskDump](/modules/diskdump/) is that it automatically converts linefeeds in known text files
diff --git a/tests/pc/vga/REGS.H b/tests/pcx86/vga/REGS.H
similarity index 100%
rename from tests/pc/vga/REGS.H
rename to tests/pcx86/vga/REGS.H
diff --git a/tests/pc/vga/VGABIN.json b/tests/pcx86/vga/VGABIN.json
similarity index 100%
rename from tests/pc/vga/VGABIN.json
rename to tests/pcx86/vga/VGABIN.json