slbt_ar_parse_primary_armap_bsd_64(): move to own translation unit.

4 files changed, 165 insertions, 144 deletions

diff --git a/project/common.mk b/project/common.mk
index bf3c6ab..2a2ab6c 100644
--- a/project/common.mk
+++ b/project/common.mk
@@ -2,6 +2,7 @@ API_SRCS = \
 	src/arbits/slbt_archive_ctx.c \
 	src/arbits/slbt_archive_meta.c \
 	src/arbits/slbt_armap_bsd_32.c \
+	src/arbits/slbt_armap_bsd_64.c \
 	src/arbits/output/slbt_ar_output_arname.c \
 	src/arbits/output/slbt_ar_output_members.c \
 	src/driver/slbt_amain.c \
diff --git a/src/arbits/slbt_archive_meta.c b/src/arbits/slbt_archive_meta.c
index fcc3f2f..9aaf6ee 100644
--- a/src/arbits/slbt_archive_meta.c
+++ b/src/arbits/slbt_archive_meta.c
@@ -229,150 +229,6 @@ static uint32_t slbt_ar_get_member_attr(struct ar_meta_member_info * m)
 	return AR_MEMBER_ATTR_DEFAULT;
 }
 
-static int slbt_ar_parse_primary_armap_bsd_64(
-	const struct slbt_driver_ctx *  dctx,
-	struct slbt_archive_meta_impl * m)
-{
-	struct ar_raw_armap_bsd_64 *    armap;
-	struct ar_meta_member_info *    memberp;
-	struct ar_meta_armap_common_64 *armapref;
-	struct ar_meta_armap_ref_64 *   symrefs;
-	uint64_t                        idx;
-	uint64_t                        uref_hi;
-	uint64_t                        uref_lo;
-	uint32_t                        attr;
-	uint64_t                        u64_lo;
-	uint64_t                        u64_hi;
-	uint64_t                        nsyms;
-	uint64_t                        nstrs;
-	uint64_t                        sizeofrefs_le;
-	uint64_t                        sizeofrefs_be;
-	uint64_t                        sizeofrefs;
-	uint64_t                        sizeofstrs;
-	const char *                    ch;
-	const char *                    cap;
-	unsigned char *                 uch;
-	unsigned char                   (*mark)[0x08];
-
-	armap   = &m->armaps.armap_bsd_64;
-	memberp = m->memberv[0];
-
-	mark = memberp->ar_object_data;
-
-	armap->ar_size_of_refs = mark;
-	uch = *mark++;
-
-	armap->ar_first_name_offset = mark;
-
-	u64_lo = (uch[3] << 24) + (uch[2] << 16) + (uch[1] << 8) + uch[0];
-	u64_hi = (uch[7] << 24) + (uch[6] << 16) + (uch[5] << 8) + uch[4];
-
-	sizeofrefs_le = u64_lo + (u64_hi << 32);
-
-	u64_hi = (uch[0] << 24) + (uch[1] << 16) + (uch[2] << 8) + uch[3];
-	u64_lo = (uch[4] << 24) + (uch[5] << 16) + (uch[6] << 8) + uch[7];
-
-	sizeofrefs_be = (u64_hi << 32) + u64_lo;
-
-	if (sizeofrefs_le < memberp->ar_object_size - sizeof(*mark)) {
-		sizeofrefs = sizeofrefs_le;
-		attr       = AR_ARMAP_ATTR_LE_64;
-
-	} else if (sizeofrefs_be < memberp->ar_object_size - sizeof(*mark)) {
-		sizeofrefs = sizeofrefs_be;
-		attr       = AR_ARMAP_ATTR_BE_64;
-	} else {
-		return SLBT_CUSTOM_ERROR(
-			dctx,
-			SLBT_ERR_AR_INVALID_ARMAP_SIZE_OF_REFS);
-	}
-
-	nsyms  = sizeofrefs / sizeof(struct ar_raw_armap_ref_64);
-	mark  += (sizeofrefs / sizeof(*mark));
-
-	armap->ar_size_of_strs = mark;
-	uch = *mark++;
-
-	if (attr == AR_ARMAP_ATTR_LE_64) {
-		u64_lo = (uch[3] << 24) + (uch[2] << 16) + (uch[1] << 8) + uch[0];
-		u64_hi = (uch[7] << 24) + (uch[6] << 16) + (uch[5] << 8) + uch[4];
-	} else {
-		u64_hi = (uch[0] << 24) + (uch[1] << 16) + (uch[2] << 8) + uch[3];
-		u64_lo = (uch[4] << 24) + (uch[5] << 16) + (uch[6] << 8) + uch[7];
-	}
-
-	sizeofstrs = u64_lo + (u64_hi << 32);
-	m->symstrs = (const char *)mark;
-
-	cap  = m->symstrs;
-	cap += sizeofstrs;
-
-	if ((cap == m->symstrs) && nsyms)
-		return SLBT_CUSTOM_ERROR(
-			dctx,
-			SLBT_ERR_AR_INVALID_ARMAP_STRING_TABLE);
-
-	if (nsyms && !m->symstrs[0])
-		return SLBT_CUSTOM_ERROR(
-			dctx,
-			SLBT_ERR_AR_INVALID_ARMAP_STRING_TABLE);
-
-	for (ch=&m->symstrs[1],nstrs=0; ch<cap; ch++) {
-		if (!ch[0] && !ch[-1] && (nstrs < nsyms))
-			return SLBT_CUSTOM_ERROR(
-				dctx,
-				SLBT_ERR_AR_INVALID_ARMAP_STRING_TABLE);
-
-		if (!ch[0] && ch[-1] && (nstrs < nsyms))
-			nstrs++;
-	}
-
-	if (nstrs != nsyms)
-		return SLBT_CUSTOM_ERROR(
-			dctx,
-			SLBT_ERR_AR_INVALID_ARMAP_STRING_TABLE);
-
-	if (!(m->symstrv = calloc(nsyms + 1,sizeof(const char *))))
-		return SLBT_SYSTEM_ERROR(dctx,0);
-
-	if (!(m->armaps.armap_symrefs_64 = calloc(nsyms + 1,sizeof(*symrefs))))
-		return SLBT_SYSTEM_ERROR(dctx,0);
-
-	mark    = armap->ar_first_name_offset;
-	symrefs = m->armaps.armap_symrefs_64;
-
-	for (idx=0,uch=*++mark; idx<nsyms; idx++,uch=*++mark) {
-		if (attr == AR_ARMAP_ATTR_BE_64) {
-			uref_hi = (uch[0] << 24) + (uch[1] << 16) + (uch[2] << 8) + uch[3];
-			uref_lo = (uch[4] << 24) + (uch[5] << 16) + (uch[6] << 8) + uch[7];
-		} else {
-			uref_lo = (uch[3] << 24) + (uch[2] << 16) + (uch[1] << 8) + uch[0];
-			uref_hi = (uch[7] << 24) + (uch[6] << 16) + (uch[5] << 8) + uch[4];
-		}
-
-		symrefs[idx].ar_member_offset = (uref_hi << 32) + uref_lo;
-		mark++;
-	}
-
-	armap->ar_string_table = m->symstrv;
-
-	armapref = &m->armaps.armap_common_64;
-	armapref->ar_member         = memberp;
-	armapref->ar_symrefs        = symrefs;
-	armapref->ar_armap_bsd      = armap;
-	armapref->ar_armap_attr     = AR_ARMAP_ATTR_BSD | attr;
-	armapref->ar_num_of_symbols = nsyms;
-	armapref->ar_size_of_refs   = sizeofrefs;
-	armapref->ar_size_of_strs   = sizeofstrs;
-	armapref->ar_string_table   = m->symstrs;
-
-	m->armaps.armap_nsyms = nsyms;
-
-	m->armeta.a_armap_primary.ar_armap_common_64 = armapref;
-
-	return 0;
-}
-
 static int slbt_ar_parse_primary_armap_sysv_32(
 	const struct slbt_driver_ctx *  dctx,
 	struct slbt_archive_meta_impl * m)
diff --git a/src/arbits/slbt_armap_bsd_64.c b/src/arbits/slbt_armap_bsd_64.c
new file mode 100644
index 0000000..b7b7d6d
--- /dev/null
+++ b/src/arbits/slbt_armap_bsd_64.c
@@ -0,0 +1,160 @@
+/*******************************************************************/
+/*  slibtool: a skinny libtool implementation, written in C        */
+/*  Copyright (C) 2016--2024  SysDeer Technologies, LLC            */
+/*  Released under the Standard MIT License; see COPYING.SLIBTOOL. */
+/*******************************************************************/
+
+#include <stdint.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <slibtool/slibtool.h>
+#include <slibtool/slibtool_arbits.h>
+#include "slibtool_ar_impl.h"
+#include "slibtool_driver_impl.h"
+#include "slibtool_errinfo_impl.h"
+
+int slbt_ar_parse_primary_armap_bsd_64(
+	const struct slbt_driver_ctx *  dctx,
+	struct slbt_archive_meta_impl * m)
+{
+	struct ar_raw_armap_bsd_64 *    armap;
+	struct ar_meta_member_info *    memberp;
+	struct ar_meta_armap_common_64 *armapref;
+	struct ar_meta_armap_ref_64 *   symrefs;
+	uint64_t                        idx;
+	uint64_t                        uref_hi;
+	uint64_t                        uref_lo;
+	uint32_t                        attr;
+	uint64_t                        u64_lo;
+	uint64_t                        u64_hi;
+	uint64_t                        nsyms;
+	uint64_t                        nstrs;
+	uint64_t                        sizeofrefs_le;
+	uint64_t                        sizeofrefs_be;
+	uint64_t                        sizeofrefs;
+	uint64_t                        sizeofstrs;
+	const char *                    ch;
+	const char *                    cap;
+	unsigned char *                 uch;
+	unsigned char                   (*mark)[0x08];
+
+	armap   = &m->armaps.armap_bsd_64;
+	memberp = m->memberv[0];
+
+	mark = memberp->ar_object_data;
+
+	armap->ar_size_of_refs = mark;
+	uch = *mark++;
+
+	armap->ar_first_name_offset = mark;
+
+	u64_lo = (uch[3] << 24) + (uch[2] << 16) + (uch[1] << 8) + uch[0];
+	u64_hi = (uch[7] << 24) + (uch[6] << 16) + (uch[5] << 8) + uch[4];
+
+	sizeofrefs_le = u64_lo + (u64_hi << 32);
+
+	u64_hi = (uch[0] << 24) + (uch[1] << 16) + (uch[2] << 8) + uch[3];
+	u64_lo = (uch[4] << 24) + (uch[5] << 16) + (uch[6] << 8) + uch[7];
+
+	sizeofrefs_be = (u64_hi << 32) + u64_lo;
+
+	if (sizeofrefs_le < memberp->ar_object_size - sizeof(*mark)) {
+		sizeofrefs = sizeofrefs_le;
+		attr       = AR_ARMAP_ATTR_LE_64;
+
+	} else if (sizeofrefs_be < memberp->ar_object_size - sizeof(*mark)) {
+		sizeofrefs = sizeofrefs_be;
+		attr       = AR_ARMAP_ATTR_BE_64;
+	} else {
+		return SLBT_CUSTOM_ERROR(
+			dctx,
+			SLBT_ERR_AR_INVALID_ARMAP_SIZE_OF_REFS);
+	}
+
+	nsyms  = sizeofrefs / sizeof(struct ar_raw_armap_ref_64);
+	mark  += (sizeofrefs / sizeof(*mark));
+
+	armap->ar_size_of_strs = mark;
+	uch = *mark++;
+
+	if (attr == AR_ARMAP_ATTR_LE_64) {
+		u64_lo = (uch[3] << 24) + (uch[2] << 16) + (uch[1] << 8) + uch[0];
+		u64_hi = (uch[7] << 24) + (uch[6] << 16) + (uch[5] << 8) + uch[4];
+	} else {
+		u64_hi = (uch[0] << 24) + (uch[1] << 16) + (uch[2] << 8) + uch[3];
+		u64_lo = (uch[4] << 24) + (uch[5] << 16) + (uch[6] << 8) + uch[7];
+	}
+
+	sizeofstrs = u64_lo + (u64_hi << 32);
+	m->symstrs = (const char *)mark;
+
+	cap  = m->symstrs;
+	cap += sizeofstrs;
+
+	if ((cap == m->symstrs) && nsyms)
+		return SLBT_CUSTOM_ERROR(
+			dctx,
+			SLBT_ERR_AR_INVALID_ARMAP_STRING_TABLE);
+
+	if (nsyms && !m->symstrs[0])
+		return SLBT_CUSTOM_ERROR(
+			dctx,
+			SLBT_ERR_AR_INVALID_ARMAP_STRING_TABLE);
+
+	for (ch=&m->symstrs[1],nstrs=0; ch<cap; ch++) {
+		if (!ch[0] && !ch[-1] && (nstrs < nsyms))
+			return SLBT_CUSTOM_ERROR(
+				dctx,
+				SLBT_ERR_AR_INVALID_ARMAP_STRING_TABLE);
+
+		if (!ch[0] && ch[-1] && (nstrs < nsyms))
+			nstrs++;
+	}
+
+	if (nstrs != nsyms)
+		return SLBT_CUSTOM_ERROR(
+			dctx,
+			SLBT_ERR_AR_INVALID_ARMAP_STRING_TABLE);
+
+	if (!(m->symstrv = calloc(nsyms + 1,sizeof(const char *))))
+		return SLBT_SYSTEM_ERROR(dctx,0);
+
+	if (!(m->armaps.armap_symrefs_64 = calloc(nsyms + 1,sizeof(*symrefs))))
+		return SLBT_SYSTEM_ERROR(dctx,0);
+
+	mark    = armap->ar_first_name_offset;
+	symrefs = m->armaps.armap_symrefs_64;
+
+	for (idx=0,uch=*++mark; idx<nsyms; idx++,uch=*++mark) {
+		if (attr == AR_ARMAP_ATTR_BE_64) {
+			uref_hi = (uch[0] << 24) + (uch[1] << 16) + (uch[2] << 8) + uch[3];
+			uref_lo = (uch[4] << 24) + (uch[5] << 16) + (uch[6] << 8) + uch[7];
+		} else {
+			uref_lo = (uch[3] << 24) + (uch[2] << 16) + (uch[1] << 8) + uch[0];
+			uref_hi = (uch[7] << 24) + (uch[6] << 16) + (uch[5] << 8) + uch[4];
+		}
+
+		symrefs[idx].ar_member_offset = (uref_hi << 32) + uref_lo;
+		mark++;
+	}
+
+	armap->ar_string_table = m->symstrv;
+
+	armapref = &m->armaps.armap_common_64;
+	armapref->ar_member         = memberp;
+	armapref->ar_symrefs        = symrefs;
+	armapref->ar_armap_bsd      = armap;
+	armapref->ar_armap_attr     = AR_ARMAP_ATTR_BSD | attr;
+	armapref->ar_num_of_symbols = nsyms;
+	armapref->ar_size_of_refs   = sizeofrefs;
+	armapref->ar_size_of_strs   = sizeofstrs;
+	armapref->ar_string_table   = m->symstrs;
+
+	m->armaps.armap_nsyms = nsyms;
+
+	m->armeta.a_armap_primary.ar_armap_common_64 = armapref;
+
+	return 0;
+}
diff --git a/src/internal/slibtool_ar_impl.h b/src/internal/slibtool_ar_impl.h
index 4b34abd..7530a0a 100644
--- a/src/internal/slibtool_ar_impl.h
+++ b/src/internal/slibtool_ar_impl.h
@@ -50,6 +50,10 @@ int slbt_ar_parse_primary_armap_bsd_32(
 	const struct slbt_driver_ctx *  dctx,
 	struct slbt_archive_meta_impl * m);
 
+int slbt_ar_parse_primary_armap_bsd_64(
+	const struct slbt_driver_ctx *  dctx,
+	struct slbt_archive_meta_impl * m);
+
 static inline struct slbt_archive_meta_impl * slbt_archive_meta_ictx(const struct slbt_archive_meta * meta)
 {
 	uintptr_t addr;