Skip to content

Commit a0b3dac

Browse files
kkliskklis
committed
Merge remote-tracking branch 'upstream/master'
2 parents 7332385 + a0fab16 commit a0b3dac

20 files changed

+196
-299
lines changed

‎DISK/1STREAD.ME

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
MLOAD - Multi-file HEX Load Utility.
8383
v2.1 - Copyright (c) 1984 by Ron Fowler
8484
TE - Text Editor.
85-
v1.06 - Copyright (c) 2015, 2016 by Miguel Garcia
85+
v1.11 - Copyright (c) 2015-2018 by Miguel Garcia
8686
UNARC - Archive File Extractor.
8787
v1.6 - Copyright (c) 1986, 1987 by Robert A. Freed
8888
UNCR - File Un-Cruncher.

‎DISK/A.ZIP

4.23 KB
Binary file not shown.

‎Release/RunCPM.exe

-173 KB
Binary file not shown.

‎RunCPM/Makefile.mingw

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CC = gcc
99
#CC = gcc -DDEBUG=1 -DDEBUGLOG=1
1010

1111
# Flags to pass to the compiler - add "-g" to include debug information
12-
CFLAGS = -Wall -O0 -fPIC -Wno-unused-variable -DHASLUA
12+
CFLAGS = -Wall -O3 -fPIC -Wno-unused-variable
1313
#CFLAGS = -Wall -O0 -fPIC -Wno-unused-variable -g
1414

1515
# Flags to pass to the linker

‎RunCPM/Makefile.msys2

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CC = gcc
99
#CC = gcc -DDEBUG=1 -DDEBUGLOG=1
1010

1111
# Flags to pass to the compiler - add "-g" to include debug information
12-
CFLAGS = -Wall -O0 -fPIC -Wno-unused-variable -DHASLUA
12+
CFLAGS = -Wall -O3 -fPIC -Wno-unused-variable
1313
#CFLAGS = -Wall -O0 -fPIC -Wno-unused-variable -g
1414

1515
# Flags to pass to the linker

‎RunCPM/Makefile.posix

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CC = gcc
99
#CC = gcc -DDEBUG=1 -DDEBUGLOG=1
1010

1111
# Flags to pass to the compiler - add "-g" to include debug information
12-
CFLAGS = -Wall -O0 -fPIC -Wno-unused-variable -DHASLUA
12+
CFLAGS = -Wall -O3 -fPIC -Wno-unused-variable
1313
#CFLAGS = -Wall -O0 -fPIC -Wno-unused-variable -g
1414

1515
# Flags to pass to the linker

‎RunCPM/Makefile.tdm

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CC = mingw32-gcc
99
#CC = mingw32-gcc -DDEBUG=1 -DDEBUGLOG=1
1010

1111
# Flags to pass to the compiler - add "-g" to include debug information
12-
CFLAGS = -Wall -O0 -fPIC -Wno-unused-variable -DHASLUA
12+
CFLAGS = -Wall -O3 -fPIC -Wno-unused-variable
1313
#CFLAGS = -Wall -O0 -fPIC -Wno-unused-variable -g
1414

1515
# Flags to pass to the linker

‎RunCPM/RunCPM.vcxproj

+15-44
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -22,31 +22,32 @@
2222
<ProjectGuid>{D3F45C7E-0D22-4FED-BC40-561C38256DC5}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
<RootNamespace>RunCPM</RootNamespace>
25+
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
2526
</PropertyGroup>
2627
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2728
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2829
<ConfigurationType>Application</ConfigurationType>
2930
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>v140</PlatformToolset>
31+
<PlatformToolset>v141</PlatformToolset>
3132
<CharacterSet>MultiByte</CharacterSet>
3233
</PropertyGroup>
3334
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3435
<ConfigurationType>Application</ConfigurationType>
3536
<UseDebugLibraries>true</UseDebugLibraries>
36-
<PlatformToolset>v140</PlatformToolset>
37+
<PlatformToolset>v141</PlatformToolset>
3738
<CharacterSet>MultiByte</CharacterSet>
3839
</PropertyGroup>
3940
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4041
<ConfigurationType>Application</ConfigurationType>
4142
<UseDebugLibraries>false</UseDebugLibraries>
42-
<PlatformToolset>v140</PlatformToolset>
43+
<PlatformToolset>v141</PlatformToolset>
4344
<WholeProgramOptimization>true</WholeProgramOptimization>
4445
<CharacterSet>MultiByte</CharacterSet>
4546
</PropertyGroup>
4647
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4748
<ConfigurationType>Application</ConfigurationType>
4849
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>v140</PlatformToolset>
50+
<PlatformToolset>v141</PlatformToolset>
5051
<WholeProgramOptimization>true</WholeProgramOptimization>
5152
<CharacterSet>MultiByte</CharacterSet>
5253
</PropertyGroup>
@@ -88,7 +89,7 @@
8889
</PrecompiledHeader>
8990
<WarningLevel>Level3</WarningLevel>
9091
<Optimization>Disabled</Optimization>
91-
<PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_CONSOLE;_LIB;HASLUA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
92+
<PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9293
<DisableLanguageExtensions>false</DisableLanguageExtensions>
9394
</ClCompile>
9495
<Link>
@@ -102,7 +103,7 @@
102103
</PrecompiledHeader>
103104
<WarningLevel>Level3</WarningLevel>
104105
<Optimization>Disabled</Optimization>
105-
<PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_CONSOLE;_LIB;HASLUA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106+
<PreprocessorDefinitions>WIN32;DEBUG;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106107
<DisableLanguageExtensions>false</DisableLanguageExtensions>
107108
</ClCompile>
108109
<Link>
@@ -115,27 +116,30 @@
115116
<WarningLevel>Level3</WarningLevel>
116117
<PrecompiledHeader>
117118
</PrecompiledHeader>
118-
<Optimization>MaxSpeed</Optimization>
119+
<Optimization>Full</Optimization>
119120
<FunctionLevelLinking>true</FunctionLevelLinking>
120121
<IntrinsicFunctions>true</IntrinsicFunctions>
121-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;HASLUA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
122+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123+
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
122124
</ClCompile>
123125
<Link>
124126
<SubSystem>Console</SubSystem>
125127
<GenerateDebugInformation>true</GenerateDebugInformation>
126128
<EnableCOMDATFolding>true</EnableCOMDATFolding>
127129
<OptimizeReferences>true</OptimizeReferences>
130+
<LinkTimeCodeGeneration>UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
128131
</Link>
129132
</ItemDefinitionGroup>
130133
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
131134
<ClCompile>
132135
<WarningLevel>Level3</WarningLevel>
133136
<PrecompiledHeader>
134137
</PrecompiledHeader>
135-
<Optimization>MaxSpeed</Optimization>
138+
<Optimization>Full</Optimization>
136139
<FunctionLevelLinking>true</FunctionLevelLinking>
137140
<IntrinsicFunctions>true</IntrinsicFunctions>
138-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;HASLUA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
141+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
142+
<OmitFramePointers>false</OmitFramePointers>
139143
</ClCompile>
140144
<Link>
141145
<SubSystem>Console</SubSystem>
@@ -145,39 +149,6 @@
145149
</Link>
146150
</ItemDefinitionGroup>
147151
<ItemGroup>
148-
<ClCompile Include="lua\lapi.c" />
149-
<ClCompile Include="lua\lauxlib.c" />
150-
<ClCompile Include="lua\lbaselib.c" />
151-
<ClCompile Include="lua\lbitlib.c" />
152-
<ClCompile Include="lua\lcode.c" />
153-
<ClCompile Include="lua\lcorolib.c" />
154-
<ClCompile Include="lua\lctype.c" />
155-
<ClCompile Include="lua\ldblib.c" />
156-
<ClCompile Include="lua\ldebug.c" />
157-
<ClCompile Include="lua\ldo.c" />
158-
<ClCompile Include="lua\ldump.c" />
159-
<ClCompile Include="lua\lfunc.c" />
160-
<ClCompile Include="lua\lgc.c" />
161-
<ClCompile Include="lua\linit.c" />
162-
<ClCompile Include="lua\liolib.c" />
163-
<ClCompile Include="lua\llex.c" />
164-
<ClCompile Include="lua\lmathlib.c" />
165-
<ClCompile Include="lua\lmem.c" />
166-
<ClCompile Include="lua\loadlib.c" />
167-
<ClCompile Include="lua\lobject.c" />
168-
<ClCompile Include="lua\lopcodes.c" />
169-
<ClCompile Include="lua\loslib.c" />
170-
<ClCompile Include="lua\lparser.c" />
171-
<ClCompile Include="lua\lstate.c" />
172-
<ClCompile Include="lua\lstring.c" />
173-
<ClCompile Include="lua\lstrlib.c" />
174-
<ClCompile Include="lua\ltable.c" />
175-
<ClCompile Include="lua\ltablib.c" />
176-
<ClCompile Include="lua\ltm.c" />
177-
<ClCompile Include="lua\lundump.c" />
178-
<ClCompile Include="lua\lutf8lib.c" />
179-
<ClCompile Include="lua\lvm.c" />
180-
<ClCompile Include="lua\lzio.c" />
181152
<ClCompile Include="main.c" />
182153
</ItemGroup>
183154
<ItemGroup>

‎RunCPM/RunCPM.vcxproj.filters

-99
Original file line numberDiff line numberDiff line change
@@ -27,105 +27,6 @@
2727
<ClCompile Include="main.c">
2828
<Filter>Source Files</Filter>
2929
</ClCompile>
30-
<ClCompile Include="lua\lapi.c">
31-
<Filter>Source Files\Lua</Filter>
32-
</ClCompile>
33-
<ClCompile Include="lua\lauxlib.c">
34-
<Filter>Source Files\Lua</Filter>
35-
</ClCompile>
36-
<ClCompile Include="lua\lbaselib.c">
37-
<Filter>Source Files\Lua</Filter>
38-
</ClCompile>
39-
<ClCompile Include="lua\lbitlib.c">
40-
<Filter>Source Files\Lua</Filter>
41-
</ClCompile>
42-
<ClCompile Include="lua\lcode.c">
43-
<Filter>Source Files\Lua</Filter>
44-
</ClCompile>
45-
<ClCompile Include="lua\lcorolib.c">
46-
<Filter>Source Files\Lua</Filter>
47-
</ClCompile>
48-
<ClCompile Include="lua\lctype.c">
49-
<Filter>Source Files\Lua</Filter>
50-
</ClCompile>
51-
<ClCompile Include="lua\ldblib.c">
52-
<Filter>Source Files\Lua</Filter>
53-
</ClCompile>
54-
<ClCompile Include="lua\ldebug.c">
55-
<Filter>Source Files\Lua</Filter>
56-
</ClCompile>
57-
<ClCompile Include="lua\ldo.c">
58-
<Filter>Source Files\Lua</Filter>
59-
</ClCompile>
60-
<ClCompile Include="lua\ldump.c">
61-
<Filter>Source Files\Lua</Filter>
62-
</ClCompile>
63-
<ClCompile Include="lua\lfunc.c">
64-
<Filter>Source Files\Lua</Filter>
65-
</ClCompile>
66-
<ClCompile Include="lua\lgc.c">
67-
<Filter>Source Files\Lua</Filter>
68-
</ClCompile>
69-
<ClCompile Include="lua\linit.c">
70-
<Filter>Source Files\Lua</Filter>
71-
</ClCompile>
72-
<ClCompile Include="lua\liolib.c">
73-
<Filter>Source Files\Lua</Filter>
74-
</ClCompile>
75-
<ClCompile Include="lua\llex.c">
76-
<Filter>Source Files\Lua</Filter>
77-
</ClCompile>
78-
<ClCompile Include="lua\lmathlib.c">
79-
<Filter>Source Files\Lua</Filter>
80-
</ClCompile>
81-
<ClCompile Include="lua\lmem.c">
82-
<Filter>Source Files\Lua</Filter>
83-
</ClCompile>
84-
<ClCompile Include="lua\loadlib.c">
85-
<Filter>Source Files\Lua</Filter>
86-
</ClCompile>
87-
<ClCompile Include="lua\lobject.c">
88-
<Filter>Source Files\Lua</Filter>
89-
</ClCompile>
90-
<ClCompile Include="lua\lopcodes.c">
91-
<Filter>Source Files\Lua</Filter>
92-
</ClCompile>
93-
<ClCompile Include="lua\loslib.c">
94-
<Filter>Source Files\Lua</Filter>
95-
</ClCompile>
96-
<ClCompile Include="lua\lparser.c">
97-
<Filter>Source Files\Lua</Filter>
98-
</ClCompile>
99-
<ClCompile Include="lua\lstate.c">
100-
<Filter>Source Files\Lua</Filter>
101-
</ClCompile>
102-
<ClCompile Include="lua\lstring.c">
103-
<Filter>Source Files\Lua</Filter>
104-
</ClCompile>
105-
<ClCompile Include="lua\lstrlib.c">
106-
<Filter>Source Files\Lua</Filter>
107-
</ClCompile>
108-
<ClCompile Include="lua\ltable.c">
109-
<Filter>Source Files\Lua</Filter>
110-
</ClCompile>
111-
<ClCompile Include="lua\ltablib.c">
112-
<Filter>Source Files\Lua</Filter>
113-
</ClCompile>
114-
<ClCompile Include="lua\ltm.c">
115-
<Filter>Source Files\Lua</Filter>
116-
</ClCompile>
117-
<ClCompile Include="lua\lundump.c">
118-
<Filter>Source Files\Lua</Filter>
119-
</ClCompile>
120-
<ClCompile Include="lua\lutf8lib.c">
121-
<Filter>Source Files\Lua</Filter>
122-
</ClCompile>
123-
<ClCompile Include="lua\lvm.c">
124-
<Filter>Source Files\Lua</Filter>
125-
</ClCompile>
126-
<ClCompile Include="lua\lzio.c">
127-
<Filter>Source Files\Lua</Filter>
128-
</ClCompile>
12930
</ItemGroup>
13031
<ItemGroup>
13132
<ClInclude Include="console.h">

‎RunCPM/abstraction_arduino.h

+14-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#ifndef ABSTRACT_H
22
#define ABSTRACT_H
33

4+
#ifdef PROFILE
5+
#define printf(a, b) Serial.println(b)
6+
#endif
7+
48
#define HostOS 0x01
59

610
/* Memory abstraction functions */
@@ -114,7 +118,7 @@ int _sys_movefile(char *filename, char *newname, int size) {
114118
if (fold = SD.open(filename, O_READ)) {
115119
if (fnew = SD.open(newname, O_CREAT | O_WRITE)) {
116120
result = true;
117-
for (i = 0; i < size; i++) {
121+
for (i = 0; i < size; ++i) {
118122
c = fold.read();
119123
if (fnew.write(c) < 1) {
120124
result = false;
@@ -145,7 +149,7 @@ void _sys_logbuffer(uint8 *buffer) {
145149
File f;
146150
uint8 s = 0;
147151
while (*(buffer+s)) // Computes buffer size
148-
s++;
152+
++s;
149153
if(f = SD.open(LogName, O_CREAT | O_APPEND | O_WRITE)) {
150154
f.write(buffer, s);
151155
f.flush();
@@ -164,7 +168,7 @@ bool _sys_extendfile(char *fn, unsigned long fpos)
164168
digitalWrite(LED, HIGH);
165169
if (f = SD.open(fn, O_WRITE | O_APPEND)) {
166170
if (fpos > f.size()) {
167-
for (i = 0; i < f.size() - fpos; i++) {
171+
for (i = 0; i < f.size() - fpos; ++i) {
168172
if (f.write((uint8_t)0) < 0) {
169173
result = false;
170174
break;
@@ -191,11 +195,11 @@ uint8 _sys_readseq(uint8 *filename, long fpos) {
191195
f = SD.open((char*)filename, O_READ);
192196
if (f) {
193197
if (f.seek(fpos)) {
194-
for (i = 0; i < 128; i++)
198+
for (i = 0; i < 128; ++i)
195199
dmabuf[i] = 0x1a;
196200
bytesread = f.read(&dmabuf[0], 128);
197201
if (bytesread) {
198-
for (i = 0; i < 128; i++)
202+
for (i = 0; i < 128; ++i)
199203
_RamWrite(dmaAddr + i, dmabuf[i]);
200204
}
201205
result = bytesread ? 0x00 : 0x01;
@@ -244,11 +248,11 @@ uint8 _sys_readrand(uint8 *filename, long fpos) {
244248
f = SD.open((char*)filename, O_READ);
245249
if (f) {
246250
if (f.seek(fpos)) {
247-
for (i = 0; i < 128; i++)
251+
for (i = 0; i < 128; ++i)
248252
dmabuf[i] = 0x1a;
249253
bytesread = f.read(&dmabuf[0], 128);
250254
if (bytesread) {
251-
for (i = 0; i < 128; i++)
255+
for (i = 0; i < 128; ++i)
252256
_RamWrite(dmaAddr + i, dmabuf[i]);
253257
}
254258
result = bytesread ? 0x00 : 0x01;
@@ -296,9 +300,9 @@ uint8 _findnext(uint8 isdir) {
296300

297301
digitalWrite(LED, HIGH);
298302
while (f = root.openNextFile()) {
299-
fname = f.name();
300-
for (i = 0; i < strlen(fname) + 1 && i < 13; i++)
301-
dirname[i] = fname[i];
303+
fname = f.name();
304+
for (i = 0; i < strlen(fname) + 1 && i < 13; ++i)
305+
dirname[i] = fname[i];
302306
isfile = !f.isDirectory();
303307
f.close();
304308
if (!isfile)

‎RunCPM/abstraction_posix.h

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
#define ABSTRACT_H
33

44
#include <glob.h>
5+
#ifdef PROFILE
6+
#include <time.h>
7+
#define millis() clock()/1000
8+
#endif
59

610
// Lua scripting support
711
#ifdef HASLUA
@@ -37,8 +41,8 @@ uint8 _findnext(uint8 isdir)
3741
dir[2] = filename[2];
3842
#endif
3943
if (!glob(dir, 0, NULL, &pglob)) {
40-
for (i = dirPos; i < pglob.gl_pathc; i++) {
41-
dirPos++;
44+
for (i = dirPos; i < pglob.gl_pathc; ++i) {
45+
++dirPos;
4246
dirname = pglob.gl_pathv[i];
4347
_HostnameToFCBname((uint8*)dirname, fcbname);
4448
if (match(fcbname, pattern) && (stat(dirname, &st) == 0) && ((st.st_mode & S_IFREG) != 0)) {

0 commit comments

Comments
 (0)