about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--079emit.subx7
-rw-r--r--Readme.md9
-rwxr-xr-xgen_linux_iso2
-rwxr-xr-xgen_soso_iso2
-rw-r--r--mu-init-test.subx2
-rwxr-xr-xtest_apps8
-rwxr-xr-xtranslate_mu4
-rwxr-xr-xtranslate_subx (renamed from ntranslate)4
-rwxr-xr-xtranslate_subx_debug (renamed from debug_translate)4
-rwxr-xr-xtranslate_subx_emulated (renamed from translate)0
10 files changed, 22 insertions, 20 deletions
diff --git a/079emit.subx b/079emit.subx
index abf11dce..0db46bdf 100644
--- a/079emit.subx
+++ b/079emit.subx
@@ -63,9 +63,10 @@ $emit:name:
     eb/jump  $emit:end/disp8
     # otherwise emit-hex(out, parse-hex-int(datum), width)
     #   (Weird shit can happen here if the datum of 'word' isn't either a valid
-    #   name or a hex number. `emit` is mostly used by ntranslate, which is
-    #   currently designed to only receive legal SubX programs. We just want to
-    #   make sure that valid names aren't treated as (valid) hex numbers.)
+    #   name or a hex number. `emit` is mostly used by translate_subx, which
+    #   is currently designed to only receive legal SubX programs. We just
+    #   want to make sure that valid names aren't treated as (valid) hex
+    #   numbers.)
 $emit:hex-int:
     # . var value/eax : int = parse-hex-int(datum)
     # . . push args
diff --git a/Readme.md b/Readme.md
index 326d9134..1d0329de 100644
--- a/Readme.md
+++ b/Readme.md
@@ -118,16 +118,16 @@ You can use SubX to translate itself. For example, running natively on Linux:
   42
 
   # or, automating the above steps
-  $ ./ntranslate init.linux examples/ex1.subx
+  $ ./translate_subx init.linux examples/ex1.subx
   $ ./a.elf
   $ echo $?
   42
   ```
 
-Or, running in a VM on other platforms:
+Or, running in a VM on other platforms (much slower):
 
   ```sh
-  $ ./translate init.linux ex1.subx  # generates identical a.elf to above
+  $ ./translate_subx_emulated init.linux ex1.subx  # generates identical a.elf to above
   $ ./subx run a.elf
   $ echo $?
   42
@@ -433,8 +433,7 @@ runnable on a Linux system running on Intel x86 processors, either 32- or
   files into an executable ELF binary.
 
 * `subx run <ELF binary>`: simulates running the ELF binaries emitted by `subx
-  translate`. Useful for debugging, and also enables more thorough testing of
-  `translate`.
+  translate`. Useful for testing and debugging.
 
   Remember, not all 32-bit Linux binaries are guaranteed to run. I'm not
   building general infrastructure here for all of the x86 instruction set.
diff --git a/gen_linux_iso b/gen_linux_iso
index f6769ec9..6a3d6b10 100755
--- a/gen_linux_iso
+++ b/gen_linux_iso
@@ -18,7 +18,7 @@ then
 fi
 
 echo "=== building SubX binary"
-./ntranslate $*
+./translate_subx $*
 mv a.elf init
 chmod +x init
 
diff --git a/gen_soso_iso b/gen_soso_iso
index 734bc7f5..2d446ad1 100755
--- a/gen_soso_iso
+++ b/gen_soso_iso
@@ -15,7 +15,7 @@ then
 fi
 
 echo "=== building SubX binary"
-./ntranslate $*
+./translate_subx $*
 mv a.elf init
 chmod +x init
 
diff --git a/mu-init-test.subx b/mu-init-test.subx
index 6b08b113..977147fa 100644
--- a/mu-init-test.subx
+++ b/mu-init-test.subx
@@ -1,7 +1,7 @@
 # Just a test stub for mu-init.subx
 #
 # Try it out like this:
-#   $ ./ntranslate init.linux 0*.subx mu-init.subx mu-init-test.subx
+#   $ ./translate_subx init.linux 0*.subx mu-init.subx mu-init-test.subx
 #   $ ./a.elf  # should run all tests
 
 main:  # args : (address array kernel-string) -> result/ebx : int
diff --git a/test_apps b/test_apps
index 9d32fc6b..b9b22db1 100755
--- a/test_apps
+++ b/test_apps
@@ -304,7 +304,7 @@ echo "== translating using SubX (native only)"
 for n in `seq 1 12`
 do
   echo ex$n
-  ./ntranslate init.$OS examples/ex$n.subx
+  ./translate_subx init.$OS examples/ex$n.subx
   diff examples/ex$n a.elf
 done
 
@@ -313,7 +313,7 @@ done
 for app in factorial crenshaw2-1 crenshaw2-1b handle
 do
   echo $app
-  ./ntranslate init.$OS 0*.subx apps/$app.subx
+  ./translate_subx init.$OS 0*.subx apps/$app.subx
   diff apps/$app a.elf
 done
 
@@ -322,13 +322,13 @@ done
 for app in hex survey pack assort dquotes tests sigils calls braces
 do
   echo $app
-  ./ntranslate init.$OS 0*.subx apps/subx-params.subx apps/$app.subx
+  ./translate_subx init.$OS 0*.subx apps/subx-params.subx apps/$app.subx
   diff apps/$app a.elf
 done
 
 # Mu translator
 echo mu
-./ntranslate init.$OS 0*.subx apps/mu.subx
+./translate_subx init.$OS 0*.subx apps/mu.subx
 diff apps/mu a.elf
 
 exit 0
diff --git a/translate_mu b/translate_mu
index d3029433..d6e6bfa9 100755
--- a/translate_mu
+++ b/translate_mu
@@ -1,7 +1,9 @@
 #!/bin/sh
+# Translate given Mu programs into ELF binaries.
+# Linux only for now.
 
 set -e
 
 cat $*          |apps/mu      > a.subx
 
-./ntranslate init.linux 0*.subx mu-init.subx a.subx
+./translate_subx init.linux 0*.subx mu-init.subx a.subx
diff --git a/ntranslate b/translate_subx
index e1c6f99b..ba36986a 100755
--- a/ntranslate
+++ b/translate_subx
@@ -31,8 +31,8 @@ cat a.tests     |apps/assort   > a.assort
 
 cat a.assort    |apps/dquotes  > a.dquotes
 
-# A little hack. We want ntranslate to always emit identical binaries to the
-# C++ translator. The C++ translator assorts segments before it processes
+# A little hack. We want translate_subx to always emit identical binaries to
+# the C++ translator. The C++ translator assorts segments before it processes
 # string literals, so we follow the same order above.
 #
 # However, dquotes currently emits a separate data segment for string literals.
diff --git a/debug_translate b/translate_subx_debug
index c1991abe..f5754f37 100755
--- a/debug_translate
+++ b/translate_subx_debug
@@ -7,13 +7,13 @@
 #   1. The self-hosted translator 'translate' runs in emulated mode and can
 #   run on Linux or BSD or Mac. However, syntax sugar passes (sigils and
 #   calls) can be very slow to run emulated.
-#   2. The self-hosted translator 'ntranslate' runs natively on Linux. It is
+#   2. The self-hosted translator 'translate_subx' runs natively on Linux. It is
 #   fast, but you get no trace for runs and zero error-checking on the code
 #   emitted by sigils and calls. Which could still be buggy.
 #
 # This script is a hack to get the best of all worlds. We run natively what we
 # must, and leverage as much debug information as possible. This arrangement
-# is snappy but requires Linux just like 'ntranslate'. You also are on your
+# is snappy but requires Linux just like 'translate_subx'. You also are on your
 # own to mentally map desugared instructions in traces and error messages back
 # to the original sources.
 
diff --git a/translate b/translate_subx_emulated
index 639d924e..639d924e 100755
--- a/translate
+++ b/translate_subx_emulated
'n503' href='#n503'>503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149