X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.h;h=360f3dd9f6321919df742d4fa7992ffbce0f9e27;hb=bf0883b6dd3946612922aa1b7c04a87d06442df7;hp=f60381f9905ddb6573c304470b0be7304aed6a9d;hpb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;p=builder.git

diff --git a/source/architecture.h b/source/architecture.h
index f60381f..360f3dd 100644
--- a/source/architecture.h
+++ b/source/architecture.h
@@ -1,60 +1,89 @@
 #ifndef ARCHITECTURE_H_
 #define ARCHITECTURE_H_
 
+#include <typeinfo>
 #include <msp/datafile/loader.h>
 #include "buildinfo.h"
-#include "misc.h"
+#include "pattern.h"
 
 class Builder;
 
-// XXX Add lib/exe prefix/suffix fields.  Some archs may need multiple alternatives, how to handle this?
+/**
+Stores information about an architecture.  This includes CPU type, model and
+bitness and operating system.
+*/
 class Architecture
 {
 public:
-	class Loader: public Msp::DataFile::Loader
+	class Loader: public Msp::DataFile::ObjectLoader<Architecture>
 	{
-	private:
-		Architecture &arch;
-
 	public:
 		Loader(Architecture &);
-		Architecture &get_object() { return arch; }
-	private:
-		void tool(const std::string &t, const std::string &p);
 	};
 
+	typedef std::list<Pattern> PatternList;
+
 private:
 	Builder &builder;
 	std::string type;
 	std::string cpu;
+	std::string fpu;
 	std::string system;
 	unsigned bits;
+	std::string toolchain;
 	std::string name;
 	bool native;
 	std::string cross_prefix;
-	StringMap tools;
-	BuildInfo build_info;
+	std::map<std::string, PatternList> filename_patterns;
 
 public:
 	Architecture(Builder &b, const std::string &spec);
 
+	const std::string &get_type() const { return type; }
 	const std::string &get_name() const { return name; }
 	const std::string &get_system() const { return system; }
+	unsigned get_bits() const { return bits; }
+	const std::string &get_cpu() const { return cpu; }
+	const std::string &get_fpu() const { return fpu; }
+	const std::string &get_toolchain() const { return toolchain; }
 	bool match_name(const std::string &) const;
+	std::string best_match(const std::vector<std::string> &) const;
 	bool is_native() const { return native; }
+	bool is_cross() const { return !cross_prefix.empty(); }
 
-	void set_tool(const std::string &t, const std::string &p);
-	void set_cross_prefix(const std::string &);
-	std::string get_tool(const std::string &t) const;
 	const std::string &get_cross_prefix() const { return cross_prefix; }
 
-	const BuildInfo &get_build_info() const { return build_info; }
+	template<typename T>
+	const PatternList &get_patterns() const;
+
+	template<typename T>
+	std::string create_filename(const std::string &) const;
+
+private:
+	template<typename T>
+	void add_pattern(const std::string &);
 
 private:
-	std::string resolve_alias(const std::string &) const;
+	static void resolve_aliases(std::vector<std::string> &);
 	void parse_specification(const std::string &);
 };
 
-typedef std::map<std::string, Architecture> ArchMap;
+template<typename T>
+inline const Architecture::PatternList &Architecture::get_patterns() const
+{
+	std::map<std::string, PatternList>::const_iterator i = filename_patterns.find(typeid(T).name());
+	if(i!=filename_patterns.end())
+		return i->second;
+
+	static PatternList empty;
+	return empty;
+}
+
+template<typename T>
+inline std::string Architecture::create_filename(const std::string &base) const
+{
+	const PatternList &patterns = get_patterns<T>();
+	return patterns.empty() ? base : patterns.front().apply(base);
+}
 
 #endif