Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Get rid of pentium-win32 subdirectory.

This will let us start sharing some of this code with other
platforms.
  • Loading branch information...
commit 1c0800f02ded40e6d77f9f4002f56069b6471821 1 parent 64f7a14
@waywardmonkeys waywardmonkeys authored
Showing with 29 additions and 48 deletions.
  1. +10 −5 .gitignore
  2. +6 −7 admin/builds/Makefile
  3. +7 −10 sources/lib/run-time/{pentium-win32/makefile → Makefile.win32}
  4. +1 −1  sources/lib/run-time/collector.c
  5. 0  sources/lib/run-time/{pentium-win32 → harp-support/x86-windows}/dylan-support.harp
  6. 0  sources/lib/run-time/{pentium-win32 → harp-support/x86-windows}/dylan-support.obj
  7. 0  sources/lib/run-time/{pentium-win32 → harp-support/x86-windows}/runtime.harp
  8. 0  sources/lib/run-time/{pentium-win32 → harp-support/x86-windows}/runtime.obj
  9. 0  sources/lib/run-time/{pentium-win32 → }/heap-display.c
  10. 0  sources/lib/run-time/{pentium-win32 → }/heap-order1.c
  11. 0  sources/lib/run-time/{pentium-win32 → }/heap-order2.c
  12. 0  sources/lib/run-time/{pentium-win32 → }/heap-stat-collector.c
  13. 0  sources/lib/run-time/{pentium-win32 → }/heap-stats.c
  14. 0  sources/lib/run-time/{pentium-win32 → }/heap-table.c
  15. 0  sources/lib/run-time/{pentium-win32 → }/heap-trail.c
  16. 0  sources/lib/run-time/{pentium-win32 → }/heap-utils.c
  17. +1 −1  sources/lib/run-time/heap-utils.h
  18. 0  sources/lib/run-time/{pentium-win32 → }/minvcrt.def
  19. 0  sources/lib/run-time/{pentium-win32 → }/mpsiowin32.c
  20. +0 −11 sources/lib/run-time/pentium-win32/assert.c
  21. BIN  sources/lib/run-time/pentium-win32/debug-mpsplan.lib
  22. +0 −1  sources/lib/run-time/pentium-win32/fltused.c
  23. +0 −4 sources/lib/run-time/pentium-win32/objs.lnk
  24. +0 −4 sources/lib/run-time/pentium-win32/win32-threads-primitives.mak
  25. 0  sources/lib/run-time/{pentium-win32 → }/plinth.c
  26. 0  sources/lib/run-time/{pentium-win32 → }/rtsyms.obj
  27. 0  sources/lib/run-time/{pentium-win32 → }/rtsyms.s
  28. 0  sources/lib/run-time/{pentium-win32 → tests}/queue_test.c
  29. 0  sources/lib/run-time/{pentium-win32 → tests}/threads_primitives_test.c
  30. +1 −1  sources/lib/run-time/{pentium-win32/spy-interfaces.c → windows-spy-interfaces.c}
  31. +2 −2 sources/lib/run-time/{pentium-win32/win32-threads-primitives.c → windows-threads-primitives.c}
  32. +1 −1  sources/lib/run-time/{pentium-win32/win32-threads-primitives.h → windows-threads-primitives.h}
  33. 0  sources/lib/run-time/{pentium-win32/win32-types.h → windows-types.h}
View
15 .gitignore
@@ -19,12 +19,17 @@ Makefile
/sources/app/llvm-tablegen/tablegen-parser.dylan
/sources/jamfiles/config.jam
/sources/lib/llvm/llvm-asm-parser.dylan
+/sources/lib/run-time/collector.obj
+/sources/lib/run-time/dylan-plinth.lib
+/sources/lib/run-time/dylan-support.lib
+/sources/lib/run-time/heap-*.obj
+/sources/lib/run-time/minvcrt.exp
+/sources/lib/run-time/minvcrt.lib
+/sources/lib/run-time/mpsiowin32.obj
/sources/lib/run-time/obj-*
-/sources/lib/run-time/pentium-win32/dylan-plinth.lib
-/sources/lib/run-time/pentium-win32/dylan-support.lib
-/sources/lib/run-time/pentium-win32/minvcrt.exp
-/sources/lib/run-time/pentium-win32/minvcrt.lib
-/sources/lib/run-time/pentium-win32/pentium-run-time.lib
+/sources/lib/run-time/pentium-run-time.lib
+/sources/lib/run-time/plinth.obj
+/sources/lib/run-time/windows-*.obj
/sources/runtime-manager/debugger-nub/protocol/
/sources/runtime-manager/debugger-nub/skeletons/
/sources/runtime-manager/debugger-nub/stubs/
View
13 admin/builds/Makefile
@@ -224,7 +224,6 @@ PARSER_RUN_TIME_SOURCE = $(LIB_DIRECTORY)\parser-run-time
PENTE_SOURCE = $(DUIM_EXAMPLES_SOURCE)\pente
PENTE_INSTALL_DIRECTORY = $(DUIM_EXAMPLES_INSTALL_DIRECTORY)\pente
RUN_TIME_SOURCE = $(LIB_DIRECTORY)\run-time
-PENTIUM_RUN_TIME_SOURCE = $(LIB_DIRECTORY)\run-time\pentium-win32
PLONKER_SOURCE = $(APP_DIRECTORY)\plonker
PLONKER_INSTALL_DIRECTORY = $(MIDI_EXAMPLES_INSTALL_DIRECTORY)\plonker
PPML_SOURCE = $(LIB_DIRECTORY)\ppml
@@ -1182,17 +1181,17 @@ duim-sources:
#
mm-pentium-run-time:
- $(ENSURE_SOURCES) pentium-run-time $(PENTIUM_RUN_TIME_SOURCE)
+ $(ENSURE_SOURCES) pentium-run-time $(RUN_TIME_SOURCE)
echo Building pentium run time [$(PENTIUM_RUNTIME_OPTIONS)]
- pushd $(PENTIUM_RUN_TIME_SOURCE) \
- & $(MAKE) $(PENTIUM_RUNTIME_OPTIONS) install /f makefile > $(BUILD_LOGS)\make-pentium-run-time.log \
+ pushd $(RUN_TIME_SOURCE) \
+ & $(MAKE) $(PENTIUM_RUNTIME_OPTIONS) install /f Makefile.win32 > $(BUILD_LOGS)\make-pentium-run-time.log \
& popd
boehm-pentium-run-time:
- $(ENSURE_SOURCES) pentium-run-time $(PENTIUM_RUN_TIME_SOURCE)
+ $(ENSURE_SOURCES) pentium-run-time $(RUN_TIME_SOURCE)
echo Building pentium run time (Boehm GC)
- pushd $(PENTIUM_RUN_TIME_SOURCE) \
- & $(MAKE) install-boehm /f makefile > $(BUILD_LOGS)\make-boehm-pentium-run-time.log \
+ pushd $(RUN_TIME_SOURCE) \
+ & $(MAKE) install-boehm /f Makefile.win32 > $(BUILD_LOGS)\make-boehm-pentium-run-time.log \
& popd
$(PENTIUM_RUN_TIME): mm-pentium-run-time
View
17 sources/lib/run-time/pentium-win32/makefile → sources/lib/run-time/Makefile.win32
@@ -34,9 +34,9 @@ CC = $(cc)
LINKLIB = $(implib) /nologo /out:
CFLAGS = $(cflags) $(cvarsmt) $(cdebug) /I$(INCLUDEDEST) /I. /I.. /I$(SDK4MEMORY_POOL_SYSTEM)\code $(OPEN_DYLAN_C_FLAGS)
HEAPOBJS = heap-display.obj heap-utils.obj heap-trail.obj heap-order1.obj heap-order2.obj heap-table.obj
-OBJS = collector.obj $(HEAPOBJS) runtime.obj win32-threads-primitives.obj spy-interfaces.obj
+OBJS = collector.obj $(HEAPOBJS) harp-support\x86-windows\runtime.obj windows-threads-primitives.obj windows-spy-interfaces.obj
LIBFILE = pentium-run-time.lib
-USEROBJ = dylan-support.obj
+USEROBJ = harp-support\x86-windows\dylan-support.obj
USERLIB = dylan-support.lib
MINCRT = minvcrt.lib
@@ -57,19 +57,16 @@ SYMBOLICPLINTH = mpsplan.lib
PLINTHOBJS = plinth.obj mpsiowin32.obj
DYLANPLINTH = dylan-plinth.lib
-collector.obj: ..\collector.c
- $(CC) $(CFLAGS) /c ..\collector.c
-
!if defined(fullcrt)
$(MINCRT):
!else
$(MINCRT): minvcrt.def rtsyms.obj
$(LINKLIB)$(MINCRT) /def:minvcrt.def /machine:ix86
$(LINKLIB)$(MINCRT) $(MINCRT) rtsyms.obj
-!endif
rtsyms.obj: rtsyms.s
as -n -o rtsyms.obj rtsyms.s
+!endif
$(DYLANPLINTH): $(PLINTHOBJS)
$(LINKLIB)$(DYLANPLINTH) $(PLINTHOBJS)
@@ -86,9 +83,9 @@ ensure-dirs:
install-build:
echo Building pentium run time: install-build
- xcopy /i/q ..\..\..\jamfiles\*.jam $(LIBDEST)
+ xcopy /i/q ..\..\jamfiles\*.jam $(LIBDEST)
if not exist $(LIBDEST)\x86-win32-build.jam copy $(LIBDEST)\x86-win32-vc6-build.jam $(LIBDEST)\x86-win32-build.jam
- if not exist $(LIBDEST)\dylan-support.obj copy dylan-support.obj $(LIBDEST)
+ if not exist $(LIBDEST)\dylan-support.obj copy $(USEROBJ) $(LIBDEST)
install-userlib: $(USERLIB)
echo Building pentium run time: install-userlib
@@ -164,8 +161,8 @@ install: ensure-dirs install-stripped install-build
# Only delete the products that should be built by this makefile.
# (The files runtime.obj & dylan-support.obj are checked out from HOPE)
clean:
- pushd . & (del /f /q *collector.obj $(HEAPOBJS) win32-threads-primitives.obj spy-interfaces.obj) & popd
+ pushd . & (del /f /q *collector.obj $(HEAPOBJS) windows-threads-primitives.obj windows-spy-interfaces.obj) & popd
pushd . & (del /f /q *pentium-run-time.lib $(USERLIB)) & popd
- pushd . & (del /f /q $(MINCRT) rtsyms.obj) & popd
+ pushd . & (del /f /q $(MINCRT) mincrt.def) & popd
pushd . & (del /f /q $(DYLANPLINTH) $(PLINTHOBJS)) & popd
View
2  sources/lib/run-time/collector.c
@@ -115,7 +115,7 @@ void force_reference_to_spy_interface()
#ifdef OPEN_DYLAN_PLATFORM_UNIX
#include "unix-types.h"
#else
-#include "win32-types.h"
+#include "windows-types.h"
#endif
#include "mpscawl.h" /* MPS pool class AWL */
View
0  ...run-time/pentium-win32/dylan-support.harp → ...rp-support/x86-windows/dylan-support.harp
File renamed without changes
View
0  .../run-time/pentium-win32/dylan-support.obj → ...arp-support/x86-windows/dylan-support.obj
File renamed without changes
View
0  ...s/lib/run-time/pentium-win32/runtime.harp → ...ime/harp-support/x86-windows/runtime.harp
File renamed without changes
View
0  ...es/lib/run-time/pentium-win32/runtime.obj → ...time/harp-support/x86-windows/runtime.obj
File renamed without changes
View
0  ...lib/run-time/pentium-win32/heap-display.c → sources/lib/run-time/heap-display.c
File renamed without changes
View
0  .../lib/run-time/pentium-win32/heap-order1.c → sources/lib/run-time/heap-order1.c
File renamed without changes
View
0  .../lib/run-time/pentium-win32/heap-order2.c → sources/lib/run-time/heap-order2.c
File renamed without changes
View
0  ...-time/pentium-win32/heap-stat-collector.c → sources/lib/run-time/heap-stat-collector.c
File renamed without changes
View
0  ...s/lib/run-time/pentium-win32/heap-stats.c → sources/lib/run-time/heap-stats.c
File renamed without changes
View
0  ...s/lib/run-time/pentium-win32/heap-table.c → sources/lib/run-time/heap-table.c
File renamed without changes
View
0  ...s/lib/run-time/pentium-win32/heap-trail.c → sources/lib/run-time/heap-trail.c
File renamed without changes
View
0  ...s/lib/run-time/pentium-win32/heap-utils.c → sources/lib/run-time/heap-utils.c
File renamed without changes
View
2  sources/lib/run-time/heap-utils.h
@@ -14,7 +14,7 @@
#ifdef OPEN_DYLAN_PLATFORM_UNIX
#include "unix-types.h"
#else
-#include "win32-types.h"
+#include "windows-types.h"
#endif
View
0  ...es/lib/run-time/pentium-win32/minvcrt.def → sources/lib/run-time/minvcrt.def
File renamed without changes
View
0  ...s/lib/run-time/pentium-win32/mpsiowin32.c → sources/lib/run-time/mpsiowin32.c
File renamed without changes
View
11 sources/lib/run-time/pentium-win32/assert.c
@@ -1,11 +0,0 @@
-#include <windows.h>
-#include "mpslib.h"
-
-void __cdecl _assert (
- void *expr,
- void *filename,
- unsigned lineno
- )
-{
- mps_lib_abort();
-}
View
BIN  sources/lib/run-time/pentium-win32/debug-mpsplan.lib
Binary file not shown
View
1  sources/lib/run-time/pentium-win32/fltused.c
@@ -1 +0,0 @@
-int _fltused = 0x9875;
View
4 sources/lib/run-time/pentium-win32/objs.lnk
@@ -1,4 +0,0 @@
-collector.obj
-runtime.obj
-hacks.obj
-win32-threads-primitives.obj
View
4 sources/lib/run-time/pentium-win32/win32-threads-primitives.mak
@@ -1,4 +0,0 @@
-CFLAGS = /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE"
-
-win32-threads-primitives.obj: win32-threads-primitives.c
- cl $(CFLAGS) /c win32-threads-primitives.c
View
0  sources/lib/run-time/pentium-win32/plinth.c → sources/lib/run-time/plinth.c
File renamed without changes
View
0  ...ces/lib/run-time/pentium-win32/rtsyms.obj → sources/lib/run-time/rtsyms.obj
File renamed without changes
View
0  sources/lib/run-time/pentium-win32/rtsyms.s → sources/lib/run-time/rtsyms.s
File renamed without changes
View
0  ...s/lib/run-time/pentium-win32/queue_test.c → sources/lib/run-time/tests/queue_test.c
File renamed without changes
View
0  ...e/pentium-win32/threads_primitives_test.c → .../run-time/tests/threads_primitives_test.c
File renamed without changes
View
2  ...b/run-time/pentium-win32/spy-interfaces.c → ...ces/lib/run-time/windows-spy-interfaces.c
@@ -1,5 +1,5 @@
/* ********************************************************************* */
-/* ** spy-interfaces.c ** */
+/* ** windows-spy-interfaces.c ** */
/* ** Implementations of C Spy functions, callable by the debugger. ** */
/* ** --------------------------------------------------------------- ** */
/* ** Author: Paul Howard ** */
View
4 .../pentium-win32/win32-threads-primitives.c → ...lib/run-time/windows-threads-primitives.c
@@ -1,5 +1,5 @@
/*
- * File: win32-threads-primitives.c
+ * File: windows-threads-primitives.c
* Author: Keith Dennison
* Copyright: 1996 Functional Objects, Inc. All rights reserved.
*
@@ -24,7 +24,7 @@
#include <sys/types.h>
#include <windows.h>
-#include "win32-threads-primitives.h"
+#include "windows-threads-primitives.h"
/*****************************************************************************/
View
2  .../pentium-win32/win32-threads-primitives.h → ...lib/run-time/windows-threads-primitives.h
@@ -1,5 +1,5 @@
/*
- * File: win32-threads-primitives.h
+ * File: windows-threads-primitives.h
* Created: 4th September 1995
* Author: Rod Moyse, Keith Dennison
* Copyright 1995, 1996 Functional Objects, Inc. All rights reserved.
View
0  .../lib/run-time/pentium-win32/win32-types.h → sources/lib/run-time/windows-types.h
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.