mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-05-01 20:53:41 +02:00
25166cf7ca
18 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Jonas Maebe
|
76045bfc04 |
* merged macOS/AArch64 support + revisions these changes depended on
git-svn-id: branches/fixes_3_2@46866 - |
||
|
pierre
|
1f20cfe991 |
Merge of several commits related to enhancements in PPU writing
and more precisely to cross reading/writing fixes.
------------------------------------------------------------------------
r41896 | pierre | 2019-04-18 14:08:03 +0000 (Thu, 18 Apr 2019) | 15 lines
Integrate patch from bug report 35409.
Add possibiliy to throw InternalError
for unhandled case values inside tentryfile,
But avoid adding dependency on verbose unit
as this would break ppudump handling of ppu files.
Add RaiseAssertion virtual method to tentryfile class.
Call RaiseAssertion in tentryfile methods
where an internal error is wanted.
Override RaiseAssertion method in symtype.pas unit
to call InternalError.
Add new class tppudumpfile to override RaiseAssertion
in utils/ppuutils/ppudump.pp unit.
------------------------------------------------------------------------
--- Merging r41896 into '.':
U compiler/entfile.pas
U compiler/pcp.pas
U compiler/symtype.pas
U compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r41896 into '.':
U .
------------------------------------------------------------------------
r42111 | pierre | 2019-05-20 22:06:57 +0000 (Mon, 20 May 2019) | 1 line
List TSettings partially and improve generic output
------------------------------------------------------------------------
--- Merging r42111 into '.':
G compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42111 into '.':
G .
------------------------------------------------------------------------
r42322 | pierre | 2019-07-03 13:35:05 +0000 (Wed, 03 Jul 2019) | 1 line
Systematically include fpcdefs.inc at sart of all units used by compiler
------------------------------------------------------------------------
--- Merging r42322 into '.':
U compiler/aarch64/cpuinfo.pas
U compiler/arm/cpuinfo.pas
U compiler/avr/cpuinfo.pas
U compiler/ccharset.pas
U compiler/generic/cpuinfo.pas
U compiler/jvm/cpuinfo.pas
U compiler/m68k/cpuinfo.pas
U compiler/macho.pas
U compiler/machoutils.pas
U compiler/mips/cpuinfo.pas
G compiler/pcp.pas
U compiler/powerpc/cpuinfo.pas
U compiler/powerpc64/cpuinfo.pas
U compiler/systems/i_wii.pas
--- Recording mergeinfo for merge of r42322 into '.':
G .
------------------------------------------------------------------------
r42323 | pierre | 2019-07-04 15:24:49 +0000 (Thu, 04 Jul 2019) | 7 lines
* Set ControllerSupport to false for sparc/sparc64 and x86_64 CPUs.
This boolean must only be set to true if TControllerType is not simply (ct_none)
* ppu.pas: Increment CurrentPPULongVersion constant as the above modification
changes the number of fields of the TSettings record that is saved to
PPU in ST_LOADSETTINGS field. { not mereged }
------------------------------------------------------------------------
--- Merging r42323 into '.':
C compiler/ppu.pas { not mereged }
U compiler/sparc/cpuinfo.pas
U compiler/sparc64/cpuinfo.pas
U compiler/x86_64/cpuinfo.pas
--- Recording mergeinfo for merge of r42323 into '.':
G .
------------------------------------------------------------------------
r42324 | pierre | 2019-07-04 15:25:40 +0000 (Thu, 04 Jul 2019) | 1 line
Correctly read saved tsettings
------------------------------------------------------------------------
--- Merging r42324 into '.':
C compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42324 into '.':
G .
Summary of conflicts:
Text conflicts: 1
------------------------------------------------------------------------
r42325 | marcus | 2019-07-04 16:49:26 +0000 (Thu, 04 Jul 2019) | 1 line
Fixed ppudump compilation on big endian platforms after r42324
------------------------------------------------------------------------
--- Merging r42325 into '.':
G compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42325 into '.':
G .
------------------------------------------------------------------------
r42353 | svenbarth | 2019-07-12 16:25:33 +0000 (Fri, 12 Jul 2019) | 1 line
* write an entry name for the property options
------------------------------------------------------------------------
--- Merging r42353 into '.':
G compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42353 into '.':
G .
------------------------------------------------------------------------
r42354 | svenbarth | 2019-07-12 16:25:36 +0000 (Fri, 12 Jul 2019) | 1 line
* write a name for the none property access entry (looks nicer than a "(Nil)" at the start of the line)
------------------------------------------------------------------------
--- Merging r42354 into '.':
G compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42354 into '.':
G .
------------------------------------------------------------------------
r42527 | pierre | 2019-07-29 05:33:00 +0000 (Mon, 29 Jul 2019) | 22 lines
Fix recordtoken writing into ppu files to allow correct
handling in cross-configuration with different endianess.
The code has been modified to use the same scheme as the writing of
the other parts of the ppu, i.e. change_endian filed has been
added also to tscannerfile class of scanner unit.
This field is then used to swap values that required endianess
conversion.
* scanner.pas: change_endian filed added to tscannerfile class.
The value of this field is set as the same field in tentryfile class of entfile unit.
Token read and write methods converted to use change_endian field.
* ppu.pas: Increase CurrentPPILongVersion
* utils/ppuutils/ppudump.pp: Remove unneeded FPC_BIG_ENDIAN code
which was needed because tokens were previously written using a
different rule.
------------------------------------------------------------------------
--- Merging r42527 into '.':
C compiler/ppu.pas
U compiler/scanner.pas
G compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42527 into '.':
G .
Summary of conflicts:
Text conflicts: 1
------------------------------------------------------------------------
r42528 | pierre | 2019-07-29 11:54:27 +0000 (Mon, 29 Jul 2019) | 1 line
Changed paths:
M /trunk/compiler/scanner.pas
Try to fix bug introduced in previous commit #42527, hopefully fixing bug report 35902
------------------------------------------------------------------------
--- Merging r42528 into '.':
G compiler/scanner.pas
--- Recording mergeinfo for merge of r42528 into '.':
G .------------------------------------------------------------------------
r42530 | pierre | 2019-07-29 16:40:58 +0000 (Mon, 29 Jul 2019) | 8 lines
Try to fix ppudump for generic/inline.
* entfile.pas: Differenciate ibsymtableoptions and ibrecsymtableoptions.
* ppu.pas: Increase ppu unit CurrentPPULongVersion value.
* utils/ppuutils/ppudump.pp: Add current_symtable_options variable.
Change readsymtableoptions from procedure to function returning
the new tsymtableoptions.
------------------------------------------------------------------------
--- Merging r42530 into '.':
G compiler/entfile.pas
G compiler/ppu.pas
G compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42530 into '.':
G .
------------------------------------------------------------------------
r42583 | pierre | 2019-08-05 09:15:12 +0000 (Mon, 05 Aug 2019) | 1 line
Reorganize token buffer output to be able to use it for generics and inlined functions
------------------------------------------------------------------------
--- Merging r42583 into '.':
G compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42583 into '.':
G .
------------------------------------------------------------------------
r42591 | pierre | 2019-08-06 06:32:52 +0000 (Tue, 06 Aug 2019) | 1 line
Add mode and optimizer switches names, and check that no unknown switch is set
------------------------------------------------------------------------
--- Merging r42591 into '.':
G compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42591 into '.':
G .
------------------------------------------------------------------------
r42596 | pierre | 2019-08-06 21:32:51 +0000 (Tue, 06 Aug 2019) | 1 line
Fix gettokenbufshortint, as shortint is one byte long, not two
------------------------------------------------------------------------
--- Merging r42596 into '.':
G compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42596 into '.':
G .
------------------------------------------------------------------------
r42609 | pierre | 2019-08-09 09:29:50 +0000 (Fri, 09 Aug 2019) | 1 line
Correct size of asizeint, which is still 4-byte long even when CpuAddrBitSize is 16 as for avr and i8086
------------------------------------------------------------------------
--- Merging r42609 into '.':
G compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42609 into '.':
G .
------------------------------------------------------------------------
r42670 | pierre | 2019-08-13 06:20:23 +0000 (Tue, 13 Aug 2019) | 1 line
Reduce cpu-os dependency on real constant printout by using system.str
------------------------------------------------------------------------
--- Merging r42670 into '.':
G compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42670 into '.':
G .
------------------------------------------------------------------------
r42906 | pierre | 2019-09-02 16:00:15 +0000 (Mon, 02 Sep 2019) | 1 line
Fix problems with big endian systems without 80-bit floating point support
------------------------------------------------------------------------
--- Merging r42906 into '.':
G compiler/utils/ppuutils/ppudump.pp
--- Recording mergeinfo for merge of r42906 into '.':
G .
git-svn-id: branches/fixes_3_2@43387 -
|
||
|
pierre
|
d8b0ded10c |
Marge of more trunk fixes into fixes branch.
------------------------------------------------------------------------ r39725 | pierre | 2018-09-10 13:28:33 +0000 (Mon, 10 Sep 2018) | 1 line Add branches for 3.2.0, 3.2.1 and 3.3.1 versions ------------------------------------------------------------------------ --- Merging r39725 into '.': U tests/utils/testsuite/utests.pp --- Recording mergeinfo for merge of r39725 into '.': U . ------------------------------------------------------------------------ r39733 | pierre | 2018-09-11 08:16:56 +0000 (Tue, 11 Sep 2018) | 1 line sparc64-linux objects recompiled with GCC 7.3.0 ------------------------------------------------------------------------ --- Merging r39733 into '.': U tests/test/cg/obj/readme.txt U tests/test/cg/obj/linux/sparc64/ctest.o U tests/test/cg/obj/linux/sparc64/cpptcl1.o U tests/test/cg/obj/linux/sparc64/cpptcl2.o U tests/test/cg/obj/linux/sparc64/tcext3.o U tests/test/cg/obj/linux/sparc64/tcext4.o U tests/test/cg/obj/linux/sparc64/tcext5.o U tests/test/cg/obj/linux/sparc64/tcext6.o --- Recording mergeinfo for merge of r39733 into '.': G . ------------------------------------------------------------------------ r39808 | pierre | 2018-09-26 09:29:33 +0000 (Wed, 26 Sep 2018) | 1 line Disable libraries not compiling for jvm-java or jvm-android targets ------------------------------------------------------------------------ --- Merging r39808 into '.': U packages/fppkg/fpmake.pp U packages/fcl-base/fpmake.pp U packages/rtl-extra/fpmake.pp U packages/hermes/fpmake.pp U packages/fcl-extra/fpmake.pp U packages/fcl-db/fpmake.pp U packages/unzip/fpmake.pp U packages/odbc/fpmake.pp U packages/gdbm/fpmake.pp U packages/pthreads/fpmake.pp U packages/fcl-json/fpmake.pp U packages/pcap/fpmake.pp U packages/numlib/fpmake.pp U packages/rtl-generics/fpmake.pp U packages/zlib/fpmake.pp U packages/paszlib/fpmake.pp U packages/webidl/fpmake.pp U packages/regexpr/fpmake.pp U packages/libgd/fpmake.pp U packages/fcl-net/fpmake.pp U packages/fcl-res/fpmake.pp U packages/libpng/fpmake.pp U packages/dblib/fpmake.pp U packages/tcl/fpmake.pp U packages/openssl/fpmake.pp U packages/ibase/fpmake.pp U packages/bzip2/fpmake.pp U packages/fcl-sdo/fpmake.pp U packages/fcl-sound/fpmake.pp U packages/fcl-passrc/fpmake.pp U packages/fcl-stl/fpmake.pp U packages/libmicrohttpd/fpmake.pp U packages/mysql/fpmake.pp U packages/postgres/fpmake.pp U packages/httpd22/fpmake.pp U packages/httpd24/fpmake.pp U packages/rtl-console/fpmake.pp U packages/sqlite/fpmake.pp U packages/fftw/fpmake.pp U packages/fcl-pdf/fpmake.pp U packages/rtl-objpas/fpmake.pp U packages/fcl-image/fpmake.pp U packages/pasjpeg/fpmake.pp U packages/chm/fpmake.pp U packages/fcl-registry/fpmake.pp U packages/libtar/fpmake.pp U packages/symbolic/fpmake.pp U packages/libenet/fpmake.pp U packages/imagemagick/fpmake.pp U packages/fcl-xml/fpmake.pp U packages/oracle/fpmake.pp U packages/fcl-fpcunit/fpmake.pp U packages/fcl-js/fpmake.pp U packages/fcl-async/fpmake.pp U packages/fcl-process/fpmake.pp U packages/pastojs/fpmake.pp U packages/hash/fpmake.pp U packages/rtl-unicode/fpmake.pp U packages/fpmkunit/fpmake.pp --- Recording mergeinfo for merge of r39808 into '.': G . ------------------------------------------------------------------------ r40027 | pierre | 2018-10-24 21:37:54 +0000 (Wed, 24 Oct 2018) | 1 line Fix compilation of RTL for watcom target ------------------------------------------------------------------------ --- Merging r40027 into '.': U compiler/x86/agx86int.pas --- Recording mergeinfo for merge of r40027 into '.': G . ------------------------------------------------------------------------ r40028 | pierre | 2018-10-25 06:39:42 +0000 (Thu, 25 Oct 2018) | 1 line Try to fix compilation error after commit #40027 ------------------------------------------------------------------------ --- Merging r40028 into '.': G compiler/x86/agx86int.pas --- Recording mergeinfo for merge of r40028 into '.': G . ------------------------------------------------------------------------ r40102 | pierre | 2018-10-31 09:07:57 +0000 (Wed, 31 Oct 2018) | 1 line Replace aint (which is a compiler specific type) by ptruint type, which is defined in system unit ------------------------------------------------------------------------ --- Merging r40102 into '.': U tests/test/tarray5.pp --- Recording mergeinfo for merge of r40102 into '.': G . ------------------------------------------------------------------------ r40103 | pierre | 2018-10-31 09:59:45 +0000 (Wed, 31 Oct 2018) | 1 line Use pdword to avoid range check erro in tentryfile.getdword method ------------------------------------------------------------------------ --- Merging r40103 into '.': U compiler/entfile.pas --- Recording mergeinfo for merge of r40103 into '.': G . ------------------------------------------------------------------------ r40104 | pierre | 2018-10-31 10:21:51 +0000 (Wed, 31 Oct 2018) | 1 line Use longint type instead of AWord for Initial parameter in CalcExecutionWeigths (to avoid range error for avr compiler) ------------------------------------------------------------------------ @@ begin Result:=fen_false; n.allocoptinfo; <<<<<<< MINE (select with 'mc') (367) Weight:=PAWord(arg)^; ||||||| ORIGINAL (367) Weight:=max(PAWord(arg)^,1); ======= Weight:=max(plongint(arg)^,1); >>>>>>> THEIRS (select with 'tc') (367) case n.nodetype of casen: begin --- Merging r40104 into '.': C compiler/optutils.pas --- Recording mergeinfo for merge of r40104 into '.': G . Summary of conflicts: Text conflicts: 1 ------------------------------------------------------------------------ r40110 | pierre | 2018-10-31 14:51:23 +0000 (Wed, 31 Oct 2018) | 1 line Avoid range check error in MaskLength evaluation ------------------------------------------------------------------------ --- Merging r40110 into '.': U compiler/x86/aoptx86.pas --- Recording mergeinfo for merge of r40110 into '.': G . ------------------------------------------------------------------------ r40111 | pierre | 2018-10-31 15:47:53 +0000 (Wed, 31 Oct 2018) | 1 line Complement commit 40104, by changing type of executionweight in toptinfo record and adapt pass_2 code ------------------------------------------------------------------------ --- Merging r40111 into '.': U compiler/pass_2.pas U compiler/optbase.pas --- Recording mergeinfo for merge of r40111 into '.': G . ------------------------------------------------------------------------ r40112 | pierre | 2018-10-31 15:48:32 +0000 (Wed, 31 Oct 2018) | 1 line Disable range check completely in arm/cgcpu unit ------------------------------------------------------------------------ --- Merging r40112 into '.': U compiler/arm/cgcpu.pas --- Recording mergeinfo for merge of r40112 into '.': G . ------------------------------------------------------------------------ r40113 | pierre | 2018-10-31 15:49:14 +0000 (Wed, 31 Oct 2018) | 1 line Avoid overflow in code ------------------------------------------------------------------------ --- Merging r40113 into '.': U compiler/symdef.pas --- Recording mergeinfo for merge of r40113 into '.': G . ------------------------------------------------------------------------ r40114 | pierre | 2018-10-31 15:50:26 +0000 (Wed, 31 Oct 2018) | 1 line Add explicit rtlclean/rtl targets in fullcycle rule if DOWPOCYCLE is set ------------------------------------------------------------------------ --- Merging r40114 into '.': U compiler/Makefile.fpc U compiler/Makefile --- Recording mergeinfo for merge of r40114 into '.': G . ------------------------------------------------------------------------ r40120 | pierre | 2018-10-31 23:15:22 +0000 (Wed, 31 Oct 2018) | 1 line Change RemoveCurrentP parameter type to tai, because GetNextInstruction does not always return a taicpu, adapt code in avr/aoptcpu unit ------------------------------------------------------------------------ --- Merging r40120 into '.': U compiler/aoptobj.pas U compiler/avr/aoptcpu.pas --- Recording mergeinfo for merge of r40120 into '.': G . ------------------------------------------------------------------------ r40121 | pierre | 2018-10-31 23:16:51 +0000 (Wed, 31 Oct 2018) | 1 line Add check about tloadnode.symtableentry type before typecast ------------------------------------------------------------------------ --- Merging r40121 into '.': U compiler/ncal.pas --- Recording mergeinfo for merge of r40121 into '.': G . ------------------------------------------------------------------------ r40122 | pierre | 2018-10-31 23:18:09 +0000 (Wed, 31 Oct 2018) | 1 line Fix typecast in FindRegDeAlloc call ------------------------------------------------------------------------ --- Merging r40122 into '.': U compiler/arm/aoptcpu.pas --- Recording mergeinfo for merge of r40122 into '.': G . ------------------------------------------------------------------------ r40123 | pierre | 2018-10-31 23:19:39 +0000 (Wed, 31 Oct 2018) | 1 line Remove unneeded typecasts in TryTOptimizeMove ------------------------------------------------------------------------ --- Merging r40123 into '.': U compiler/m68k/aoptcpu.pas --- Recording mergeinfo for merge of r40123 into '.': G . ------------------------------------------------------------------------ r40124 | pierre | 2018-10-31 23:20:29 +0000 (Wed, 31 Oct 2018) | 1 line Add global range check disable for i8086 cgcpu and x86 nx86add units ------------------------------------------------------------------------ --- Merging r40124 into '.': U compiler/i8086/cgcpu.pas U compiler/x86/nx86add.pas --- Recording mergeinfo for merge of r40124 into '.': G . ------------------------------------------------------------------------ r40131 | pierre | 2018-11-01 07:01:02 +0000 (Thu, 01 Nov 2018) | 1 line Remove another wrong typecast when testing that a tai is an instruction ------------------------------------------------------------------------ --- Merging r40131 into '.': G compiler/m68k/aoptcpu.pas --- Recording mergeinfo for merge of r40131 into '.': G . ------------------------------------------------------------------------ r40236 | pierre | 2018-11-06 07:40:31 +0000 (Tue, 06 Nov 2018) | 1 line Really change extension of hs1 local variable in get_exepath ------------------------------------------------------------------------ --- Merging r40236 into '.': U compiler/globals.pas --- Recording mergeinfo for merge of r40236 into '.': G . ------------------------------------------------------------------------ r40237 | pierre | 2018-11-06 07:41:15 +0000 (Tue, 06 Nov 2018) | 1 line Disable range checking in rax86int unit ------------------------------------------------------------------------ --- Merging r40237 into '.': U compiler/x86/rax86int.pas --- Recording mergeinfo for merge of r40237 into '.': G . ------------------------------------------------------------------------ r40278 | pierre | 2018-11-08 20:19:54 +0000 (Thu, 08 Nov 2018) | 1 line Downgrade EXTDEBUG warning to note about zero size temp, as it is used for empty sets ------------------------------------------------------------------------ --- Merging r40278 into '.': U compiler/tgobj.pas --- Recording mergeinfo for merge of r40278 into '.': G . git-svn-id: branches/fixes_3_2@40624 - |
||
|
pierre
|
6205e530aa |
Merge commits 39912, 39914, 40001, 40115, 40132 and 40163
------------------------------------------------------------------------
r39912 | pierre | 2018-10-11 22:38:39 +0200 (Thu, 11 Oct 2018) | 1 line
Fix ppuload for string type for i8086, use getasizeint for all string defs but short string
------------------------------------------------------------------------
------------------------------------------------------------------------
r39914 | pierre | 2018-10-12 08:05:50 +0200 (Fri, 12 Oct 2018) | 1 line
Adapt ppudump to fix introduced in revision 39912
------------------------------------------------------------------------
------------------------------------------------------------------------
r40001 | pierre | 2018-10-21 00:19:08 +0200 (Sun, 21 Oct 2018) | 1 line
Add explicit typecast to avoid range check error
------------------------------------------------------------------------
------------------------------------------------------------------------
r40115 | pierre | 2018-10-31 23:53:11 +0100 (Wed, 31 Oct 2018) | 1 line
Avoid range check error in ReadPosInfo
------------------------------------------------------------------------
------------------------------------------------------------------------
r40132 | pierre | 2018-11-01 08:09:47 +0100 (Thu, 01 Nov 2018) | 1 line
Only call moved if len>0, as otherwise astring local variable is nil, which leads to a range check error for astring[1]
------------------------------------------------------------------------
------------------------------------------------------------------------
r40163 | pierre | 2018-11-01 22:58:54 +0100 (Thu, 01 Nov 2018) | 8 lines
More -CriotR fixes:
* entfile.pas: Change PPU header falgs filed from longint to dword.
* ngtcon.pas: Change local variable startoffset type to aword.
* omfbase.pas: Avoid calling move with a nil string s indexed as s[1],
to avoid a range check error.
* owomflib.pas: Disable range check explicitly in hash computation.
* utils/ppuutils/ppudump.pp: Adapt to flags type change in entfile.pas
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_2@40519 -
|
||
|
svenbarth
|
d50848174a |
+ add putboolean and getboolean convenience methods to tentfile
* use putboolean and getboolean where approbiate git-svn-id: trunk@37972 - |
||
|
florian
|
b41cb26727 |
+ write selected features in ppu of the system unit and load them further on
* ppu version update * -Sf might be used only during system unit compilation * loadsystemunit factored out so the system unit can be loaded earlier than other units to get features set git-svn-id: trunk@37708 - |
||
|
pierre
|
97241c46b2 |
Move getptruint/putptruint methods to tentfile class to allow use with ppudump
git-svn-id: trunk@37241 - |
||
|
Károly Balogh
|
365d774ca7 |
fixed zipinstall after r36418
git-svn-id: trunk@36419 - |
||
|
florian
|
a37237ca11 |
* avoid range check errors with absolute symbols for cpus where addresses are bigger than the registers
git-svn-id: trunk@36361 - |
||
|
Károly Balogh
|
bfd95d6bef |
fix build with generic_cpu defined after r35497
git-svn-id: trunk@35499 - |
||
|
Károly Balogh
|
69a502db37 |
instead of stringdup(ppufile.getstring), have a getpshortstring function in entfile, and use it whereever possible. this avoids an extra shortstring copy, compared to the earlier solution
git-svn-id: trunk@35233 - |
||
|
svenbarth
|
7d8d0340b9 |
Merged revision(s) 31988, 31991-31993, 32136, 32308-32309, 32312, 32318 from branches/svenbarth/packages:
Correctly parse the directives DenyPackageUnit and WeakPackageUnit ppu.pas: + add flags uf_packagedeny and uf_packageweak scandir.pas: + new procedure do_moduleflagswitch() which parses a ON/OFF/+/- argument and sets or clears a flag in the current module + new procedure dir_denypackageunit which handles DenyPackageUnit * implement dir_weakpackageunit (and move to the correct location ;) ) * InitScannerDirectives: add dir_denypackageunit handler ........ Respect DenyPackageUnit flag. pmodules.pas, proc_package: * check all contained units that are not already part of a package for their uf_package_deny flag and report an error for each that has it set ........ Do not check whether all units are used as by definition all units of a package are considered as used. pmodules.pas, proc_package: - remove call to current_module.allunitsused ........ Check whether a unit has been implicitely imported in a package. A unit is considered as implicitely imported if it is not part of a required package nor part of the units listed in the contains section. This note is useful (Delphi even provides a dialog in that case) as a package with implicitely imported units /might/ become incompatible with other packages (e.g. if another package includes that unit uses that package and includes that unit explicitely; of course that is the same as if both package included it explicitely, but with the hint one knows where to look). pmodules.pas, proc_package: * while walking the loaded units also check whether any of them not contained in a package was part of the contained units which are the same as the current module's used units ........ Generate CRC for package files pcp.pas, tpcpfile: + new field do_crc which controls CRC generation + override putdata() method to generate CRC when data is written * resetfile: enable do_crc by default ........fppu.pas, tppumodule: * loadfrompackage: mention if a unit is loaded from a package ........ fpkg.pas, tcontainedunit: + new fields offset and size for the PPU data stored inside the PCP fpcp.pas, tpcppackage: * readcontainedunits & addunit: correctly initialize offset and size to 0 ........ Store the modified PPU files directly inside the PCP and thus get finally rid of the .ppl.ppu files. entfile.pas: + new entry type ibpputable pkgutil.pas: * adjust RewritePPU to work on a stream as output instead of a filename fpcp.pas, tpcppackage: + new method writepputable() which writes the offsets and sizes of all contained units (not part of CRC!) + new method writeppudata() which rewrites all contained PPUs directly into the PCP after the ibend entry (Note: the data is written 16 Byte aligned to ease viewing of the PCP and its contained PPUs in a hex editor) + new method readpputable() which reads the offsets and sizes of all contained units + new method getmodulestream() which returns a substream for a contained module * loadpcp: also call readpputable() * writepcp: first write an empty pputable, then finish writing all data that requires the put*/write* methods of the pcpfile, then use writeppudata() to write all PPUs and finally write the correct pputable at the original location fppu.pas, tppumodule: * loadfrompackage: don't read the PPU from a file if it is contained in a package, but using the new tpcppackage.getmodulestream() and tppumodule.openppustream() methods pmodules.pas, proc_package: * don't rewrite the PPUs here pcp.pas: * increase CurrentPCPVersion ........ Fix cycling ........ git-svn-id: trunk@33514 - |
||
|
svenbarth
|
9fd8c8718a |
Partial merge of r28846 (without the global assembler symbols)
To correctly generate the import library for a package we need to resolve the dangling external symbols of all units. For this each unit now stores which symbols it exported from another unit and it also stores all global and external assembler symbols it has (maybe this can be streamlined later on, but for now this works). entfile.pas: + new entry for the imported unit symbols fmodule.pas, tmodule: + new field unitimportsyms which holds all symbols imported by a unit from another unit + new method to add an imported symbol * create, destroy & reset: correctly instantiate/free the two new lists fppu.pas, tppumodule: + new field unitimportsymsderefs to hold the derefs during loading from/storing to PPU + new method buildderefunitimportsyms to generate the derefs for each imported symbol + new method derefunitimportsyms to resolve each imported symbol deref + new method readunitimportsyms to read the imported symbols from the PPU + new method writeunitimportsyms to write all imported symbols to the PPU * load_implementation: read the imported symbols if their entry is encountered * writeppu: generate the derefs for the imported symbols and write them to the PPU * load_usedunits: resolve the imported symbols once all derefs are known symtable.pas: * addsymref: if the symbol is not from the current unit than mark it as imported ppu.pas: * increase PPU version -- Diese und die folgenden Zeilen werden ignoriert -- M entfile.pas M fmodule.pas M fppu.pas M ppu.pas M symtable.pas git-svn-id: trunk@33492 - |
||
|
svenbarth
|
f8e9b33f99 |
Merge first batch of package handling related revisions from the packages branch
Merged revision(s) 28796, 28837-28845, 28847-28850, 28852, 32135 from branches/svenbarth/packages:
Provide possibility to pass packages and search paths for packages as parameters.
fpkg.pas:
+ new unit which contains the base types related to package files (most importantly "tpackage")
globals.pas:
+ new variable "packagesearchpath" which contains all paths in which package files should be looked for
+ new variable "packagelist" which contains a list of all packages that should be used in a program or library
* InitGlobals & DoneGlobals: initialize/finalize "packagesearchpath" accordingly ("packagelist" is handled in unit fpkg using a init/done-callback)
options.pas:
+ TOption: new fields "parapackagepath" and "parapackages" to keep track of package search paths and package files passed as parameters
* TOption.interpret_option: use '-Fp' for package search paths and '-FP' for package files
* read_arguments: apply the passed package search paths and packages to their respective containers
........
+ add a new unit which will contain basic functions related to handling packages
........
Move package related functions from pmodules to pkgutil.
pmodules.pas => pkgutil.pas:
* createimportlibfromexports
* varexport
* procexport
* insert_export
* RewritePPU
........
* adjust indentation
........
Extract the code to export the symbols of a unit to its own function in pkgutil so that less functions need to be exported.
pmodules.pas, proc_package:
* move code to export the symbols of a unit to new function export_unit
pkgutil.pas:
+ new function export_unit
- remove exports of procexport, varexport and insert_export
........
Some small fixes for package parsing.
pmodules.pas, proc_package:
* use orgpattern instead of pattern to build the module name (like is done in uses sections)
* ignore duplicates when generating exports
- no need to generate an import library for the package; that is done by the program/library that uses the package
........
+ new unit fpcp of which the class tpcppackage handles the reading and writing of package metadata from/to pcp files (equivalant to tppumodule).
........
+ add unit which contains representation of a PCP file (tpcpfile) like tppufile is for units.
........
Improve export generation.
pkgutil.pas:
+ new function exportprocsym to correctly export a procedure with all its aliases
+ new function exportabstractrecordsymproc to export the members of structured types
* insert_export: handle also namespacesym and propertsym (by ignoring them)
* insert_export: correctly export classes, record and objects
* insert_export: use new exportprocsym function to export a procsym
* insert_export: only export public variables of a static symtable
........
+ add entry constants for the name of the package and the package file names, both used by a PCP file
........
* use messages to get rid of most writelns related to package loading
........
Add additional entry types for PCP files
entfile.pas:
+ new entries ibstartrequireds and ibendrequireds to store the list of required packages
+ new entries ibstartcontained and ibendcontained to store the list of contained units
+ new entries ibstartppus and ibendppus to store the list of contained PPU files
........
Generate the PCP file once the package file and the used units were compiled correctly.
pmodules.pas:
* proc_package: generate the PCP file upon successful compilation
........
Add the possibility to load all packages supplied as parameters.
pkgutil.pas:
+ new function load_packages to load all packages supplied as parameters
pmodules.pas, proc_program:
* use load_packages to load all packages before any unit is loaded
........
Add code which tries to load a unit from a package first and only then as usual.
fppu.pas, tppumodule:
+ new method loadfrompackage which searches all available packages for the unit and loads it from there if found
* loadppu: first try to load the unit from a package if any are available
........
Don't link objects files of a unit that is provided by a package.
pmodules.pas, proc_program:
* if a unit has uf_in_library set we must not include it in the units we link against
........
git-svn-id: trunk@33452 -
|
||
|
yury
|
3c6d4f1ee2 |
* Removed unused vars.
git-svn-id: trunk@33308 - |
||
|
svenbarth
|
1945bf64b4 |
Merged revision(s) 32302-32305, 32310 from branches/svenbarth/packages:
+ new stream class TCRangeStream that represents a substream of another stream while being also extendable ........ Extend tentryfile so that it can be opened from a stream in addition to a file entfile.pas, tentryfile: + new method openstream() to open a readable tentryfile based on a stream + new method createstream() to open a writeable tentryfile based on a stream * adjust openfile() to use openstream() * adjust createfile() to use createstream() ........ A few extensions for tentryfile needed for package files entfile.pas, tentryfile: + new property position to retrieve/control the position of the underlying stream (works also with tempclose()/tempopen()) + new method substream() to retrieve a stream that goes from the specified offset with the specified length (-1 create a stream that is extendable, aka for writing) + new property stream to get the underlying stream directly; be careful when using this! ........ Extend tppumodule so that it can be opened from a stream as well. fppu.pas, tppumodule: * rename openppu() to openppufile() + new method openppustream() to open a module based on a stream + put the common part of openppufile() and openppustream() into a new method openppu() ........ Fix compilation. fppu.pas, tppumodule: * openppu: add parameter ppufiletime for printing the time of the file (only if filetime is not -1) * openppufile: pass the retrieve time of the PPU to openppu() * openppustream: pass -1 to openppu() ........ git-svn-id: trunk@33109 - |
||
|
svenbarth
|
9d5f98eaa3 |
Merged revision(s) 28690 from branches/svenbarth/packages:
Extract reading of the PPU/PCP version into tentryfile. entfile.pas: + add new getversion method which uses the pointer returned by getheaderaddr to read the PPU/PCP version ppu.pas: - remove GetPPUVersion method fppu.pas, pmodules.pas, utils/ppufiles.pp, utils/ppumove.pp, utils/ppuutils/ppudump.pp * replace call to GetPPUVersion by call to getversion ........ git-svn-id: trunk@32980 - |
||
|
svenbarth
|
02e56f410d |
Merged revision(s) 28689 from branches/svenbarth/packages:
Extract functionality that is shared between the metadata files for units (PPU) and for packages (PCP) into a parent class called tentryfile
+ add new unit entfile which contains the new tentryfile class and related types and constants
* ppu.pas:
- remove methods, fields, types and constants which were moved to entfile.pas
* replace the parts of tppuheader shared with tentryheader by a field of type tentryheader
fppu.pas, pmodules.pas, utils/ppumove.pp, utils/ppuutils/ppudump.pp:
+ add entfile to uses
* adjust access to common header fields
node.pas, symdef.pas, symsym.pas, symtable.pas, wpoinfo.pas, utils/ppufiles.pp:
+ add entfile to uses
........
git-svn-id: trunk@32976 -
|