Simplify code

Author: gbaraldi

include/archspec/detect.hpp

@@ -64,6 +64,18 @@ std::vector<const Microarchitecture*> compatible_microarchitectures(const Detect
 std::vector<const Microarchitecture*> compatible_microarchitectures(const DetectedCpuInfo& info,
                                                                     const std::string& arch);
 
+/**
+ * Compare microarchitectures for sorting: prefers more ancestors and more features
+ * Returns true if a < b (a is less specific than b)
+ */
+inline bool compare_microarch_specificity(const Microarchitecture* a, const Microarchitecture* b) {
+    size_t a_depth = a->ancestors().size();
+    size_t b_depth = b->ancestors().size();
+    if (a_depth != b_depth)
+        return a_depth < b_depth;
+    return a->features().size() < b->features().size();
+}
+
 // Platform-specific detection functions
 
 #if defined(__linux__) || defined(__FreeBSD__)

include/archspec/microarchitecture.hpp

@@ -162,15 +162,17 @@ class MicroarchitectureDatabase {
     MicroarchitectureDatabase& operator=(const MicroarchitectureDatabase&) = delete;
 
     void load_embedded_data();
-    void fill_target(const std::string& name, const void* json_data);
-    bool load_from_json_internal(const void* json_ptr);
 
     std::map<std::string, Microarchitecture> targets_;
     std::map<std::string, std::set<std::string>> feature_aliases_;
     std::map<std::string, std::set<std::string>> family_features_;
     std::map<std::string, std::string> darwin_flags_;
     std::map<std::string, std::string> arm_vendors_;
     bool loaded_ = false;
+
+    // Allow JSON parsing helper access to private members
+    friend bool load_json_into_database(MicroarchitectureDatabase& db,
+                                        const std::string& json_data);
 };
 
 // Convenience function to get a microarchitecture by name