Commit 1ecb5692 authored by Andrea Bulgarelli's avatar Andrea Bulgarelli
Browse files

SDFRBBlock management of headers at different levels

parent 7c98dc48

.cproject

+183 −22
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 


<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">

	<storageModule moduleId="org.eclipse.cdt.core.settings">

		<cconfiguration id="0.1021170850">

			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1021170850" moduleId="org.eclipse.cdt.core.settings" name="Default">

		<cconfiguration id="0.1728743268">

			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1728743268" moduleId="org.eclipse.cdt.core.settings" name="Default">

				<externalSettings/>

				<extensions>

					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
@@ -16,36 +16,197 @@ 
				</extensions>

			</storageModule>

			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

				<configuration buildProperties="" description="" id="0.1021170850" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

					<folderInfo id="0.1021170850." name="/" resourcePath="">

						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.942417971" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.942417971.1186358304" name=""/>

							<builder id="org.eclipse.cdt.build.core.settings.default.builder.500863486" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.784885813" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

							<tool id="org.eclipse.cdt.build.core.settings.holder.693709585" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.422452879" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

				<configuration buildProperties="" description="" id="0.1728743268" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">

					<folderInfo id="0.1728743268." name="/" resourcePath="">

						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.712128850" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.712128850.1646655794" name=""/>

							<builder arguments="install prefix=~/local" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.1149081704" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1204012164" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

							<tool id="org.eclipse.cdt.build.core.settings.holder.699507147" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.363529204" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

							</tool>

							<tool id="org.eclipse.cdt.build.core.settings.holder.2147395476" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1233327948" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

							<tool id="org.eclipse.cdt.build.core.settings.holder.985121091" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">

								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.395107105" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

							</tool>

							<tool id="org.eclipse.cdt.build.core.settings.holder.953466047" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.851742606" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

							<tool id="org.eclipse.cdt.build.core.settings.holder.808772048" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">

								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1421764583" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

							</tool>

						</toolChain>

					</folderInfo>

				</configuration>

			</storageModule>

			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>

		</cconfiguration>

	</storageModule>

	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

		<project id="PacketLib.null.1580572093" name="PacketLib"/>

	</storageModule>

			<storageModule moduleId="scannerConfiguration">

				<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

		<scannerConfigBuildInfo instanceId="0.1021170850">

				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">

					<buildOutputProvider>

						<openAction enabled="true" filePath=""/>

						<parser enabled="true"/>

					</buildOutputProvider>

					<scannerInfoProvider id="specsFile">

						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>

						<parser enabled="true"/>

					</scannerInfoProvider>

				</profile>

				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">

					<buildOutputProvider>

						<openAction enabled="true" filePath=""/>

						<parser enabled="true"/>

					</buildOutputProvider>

					<scannerInfoProvider id="makefileGenerator">

						<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>

						<parser enabled="true"/>

					</scannerInfoProvider>

				</profile>

				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">

					<buildOutputProvider>

						<openAction enabled="true" filePath=""/>

						<parser enabled="true"/>

					</buildOutputProvider>

					<scannerInfoProvider id="specsFile">

						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>

						<parser enabled="true"/>

					</scannerInfoProvider>

				</profile>

				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">

					<buildOutputProvider>

						<openAction enabled="true" filePath=""/>

						<parser enabled="true"/>

					</buildOutputProvider>

					<scannerInfoProvider id="specsFile">

						<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>

						<parser enabled="true"/>

					</scannerInfoProvider>

				</profile>

				<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">

					<buildOutputProvider>

						<openAction enabled="true" filePath=""/>

						<parser enabled="true"/>

					</buildOutputProvider>

					<scannerInfoProvider id="specsFile">

						<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>

						<parser enabled="true"/>

					</scannerInfoProvider>

				</profile>

				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">

					<buildOutputProvider>

						<openAction enabled="true" filePath=""/>

						<parser enabled="true"/>

					</buildOutputProvider>

					<scannerInfoProvider id="specsFile">

						<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>

						<parser enabled="true"/>

					</scannerInfoProvider>

				</profile>

				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">

					<buildOutputProvider>

						<openAction enabled="true" filePath=""/>

						<parser enabled="true"/>

					</buildOutputProvider>

					<scannerInfoProvider id="specsFile">

						<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>

						<parser enabled="true"/>

					</scannerInfoProvider>

				</profile>

				<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">

					<buildOutputProvider>

						<openAction enabled="true" filePath=""/>

						<parser enabled="true"/>

					</buildOutputProvider>

					<scannerInfoProvider id="specsFile">

						<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>

						<parser enabled="true"/>

					</scannerInfoProvider>

				</profile>

				<scannerConfigBuildInfo instanceId="0.1728743268">

					<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>

					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">

						<buildOutputProvider>

							<openAction enabled="true" filePath=""/>

							<parser enabled="true"/>

						</buildOutputProvider>

						<scannerInfoProvider id="specsFile">

							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>

							<parser enabled="true"/>

						</scannerInfoProvider>

					</profile>

					<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">

						<buildOutputProvider>

							<openAction enabled="true" filePath=""/>

							<parser enabled="true"/>

						</buildOutputProvider>

						<scannerInfoProvider id="makefileGenerator">

							<runAction arguments="-E -P -v -dD" command="" useDefault="true"/>

							<parser enabled="true"/>

						</scannerInfoProvider>

					</profile>

					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">

						<buildOutputProvider>

							<openAction enabled="true" filePath=""/>

							<parser enabled="true"/>

						</buildOutputProvider>

						<scannerInfoProvider id="specsFile">

							<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>

							<parser enabled="true"/>

						</scannerInfoProvider>

					</profile>

					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">

						<buildOutputProvider>

							<openAction enabled="true" filePath=""/>

							<parser enabled="true"/>

						</buildOutputProvider>

						<scannerInfoProvider id="specsFile">

							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>

							<parser enabled="true"/>

						</scannerInfoProvider>

					</profile>

					<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">

						<buildOutputProvider>

							<openAction enabled="true" filePath=""/>

							<parser enabled="true"/>

						</buildOutputProvider>

						<scannerInfoProvider id="specsFile">

							<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>

							<parser enabled="true"/>

						</scannerInfoProvider>

					</profile>

					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">

						<buildOutputProvider>

							<openAction enabled="true" filePath=""/>

							<parser enabled="true"/>

						</buildOutputProvider>

						<scannerInfoProvider id="specsFile">

							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>

							<parser enabled="true"/>

						</scannerInfoProvider>

					</profile>

					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">

						<buildOutputProvider>

							<openAction enabled="true" filePath=""/>

							<parser enabled="true"/>

						</buildOutputProvider>

						<scannerInfoProvider id="specsFile">

							<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>

							<parser enabled="true"/>

						</scannerInfoProvider>

					</profile>

					<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">

						<buildOutputProvider>

							<openAction enabled="true" filePath=""/>

							<parser enabled="true"/>

						</buildOutputProvider>

						<scannerInfoProvider id="specsFile">

							<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>

							<parser enabled="true"/>

						</scannerInfoProvider>

					</profile>

				</scannerConfigBuildInfo>

			</storageModule>

	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>

			<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>

			<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>

		</cconfiguration>

	</storageModule>

	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

		<project id="PacketLib.null.2012093805" name="PacketLib"/>

	</storageModule>

</cproject>

.project

+52 −0
Original line number Diff line number Diff line
@@ -9,6 +9,58 @@ 
			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>

			<triggers>clean,full,incremental,</triggers>

			<arguments>

				<dictionary>

					<key>?name?</key>

					<value></value>

				</dictionary>

				<dictionary>

					<key>org.eclipse.cdt.make.core.append_environment</key>

					<value>true</value>

				</dictionary>

				<dictionary>

					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>

					<value>all</value>

				</dictionary>

				<dictionary>

					<key>org.eclipse.cdt.make.core.buildArguments</key>

					<value>install prefix=~/local</value>

				</dictionary>

				<dictionary>

					<key>org.eclipse.cdt.make.core.buildCommand</key>

					<value>make</value>

				</dictionary>

				<dictionary>

					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>

					<value>clean</value>

				</dictionary>

				<dictionary>

					<key>org.eclipse.cdt.make.core.contents</key>

					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>

				</dictionary>

				<dictionary>

					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>

					<value>false</value>

				</dictionary>

				<dictionary>

					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>

					<value>true</value>

				</dictionary>

				<dictionary>

					<key>org.eclipse.cdt.make.core.enableFullBuild</key>

					<value>true</value>

				</dictionary>

				<dictionary>

					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>

					<value>all</value>

				</dictionary>

				<dictionary>

					<key>org.eclipse.cdt.make.core.stopOnError</key>

					<value>true</value>

				</dictionary>

				<dictionary>

					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>

					<value>false</value>

				</dictionary>

			</arguments>

		</buildCommand>

		<buildCommand>

include/SDFRBBlock.h

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#define _SDFRBBLOCK_H

#include "PacketException.h"

#include "PartOfPacket.h"



#include <string>



namespace PacketLib

{
@@ -194,7 +194,7 @@ public: 
    virtual void printValueStdout();



    /// Prints the structure of this part of packet

    virtual string* printStructure();

    virtual std::string* printStructure();



    virtual bool hasFixedPart()

    {

src/ByteStream.cpp

+3 −0
Original line number Diff line number Diff line
@@ -96,6 +96,9 @@ PacketLib::ByteStream::ByteStream(ByteStreamPtr b0, ByteStreamPtr b1, ByteStream 
    byteInTheStream = (b0!=0?b0->getDimension():0) + (b1!=0?b1->getDimension():0) + (b2!=0?b2->getDimension():0);

    stream = (byte*) new byte[byteInTheStream];

    this->bigendian = (b0!=0?b0->isBigendian():(b1!=0?b1->isBigendian():(b2!=0?b2->isBigendian():false)));

	

	//TODO AZ: fare il memcpy

	

    if(b0 != 0)

    {

        dim = b0->getDimension();

src/InputPacketStream.cpp

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ Packet* InputPacketStream::readPacket() throw(PacketExceptionIO*) 
                pindex = detPacketType(b0, b1, b2);

        }

        Packet* p = packetType[pindex];

		//TODO

        if(!p->setPacketValue(b0, b1, b2)) //gli stream diventano del packet

            throw new PacketExceptionIO("it is impossible to resolve the packet.");

        return p;