Implement multiplication by separating parameters

At this point, there is no need to use 128-bits integer
multiplication and floating-point multiplication.

Author: lengjingzju

Makefile

@@ -8,7 +8,7 @@ PACKAGE_NAME    = ljson
 
 major_ver       = 1
 minor_ver       = 3
-patch_ver       = 2
+patch_ver       = 3
 staticlib       = lib$(PACKAGE_NAME).a
 sharedlib       = lib$(PACKAGE_NAME).so $(major_ver) $(minor_ver) $(patch_ver)
 testedbin       = ljson
@@ -17,11 +17,14 @@ ldoublelib      = libldouble.a
 ldoublebin      = ldouble
 
 INSTALL_HEADERS = json.h
+FMUL           ?= 0
 DTOA           ?= 0
-RBIT           ?= 7
+RBIT           ?= 11
 TCMP           ?= 2
+
+CPFLAGS        += -DUSE_FLOAT_MUL_CONVERT=$(FMUL)
 CPFLAGS        += -DJSON_DTOA_ALGORITHM=$(DTOA) # 0:ldouble 1:sprintf 2:grisu2 3:dragonbox
-CPFLAGS        += -DLSHIFT_RESERVED_BIT=$(RBIT) # 1 <= RBIT <= 11
+CPFLAGS        += -DLSHIFT_RESERVED_BIT=$(RBIT) # 2 <= RBIT <= 11
 CPFLAGS        += -DAPPROX_TAIL_CMP_VAL=$(TCMP) # 0 <= TCMP <= 4
 
 .PHONY: all clean install
@@ -33,10 +36,10 @@ object_byte_size=2304
 include inc.makes
 $(eval $(call add-liba-build,$(staticlib),json.c))
 $(eval $(call add-libso-build,$(sharedlib),json.c))
-$(eval $(call add-bin-build,$(testedbin),json_test.c,-static -L $(OBJ_PREFIX) -lljson,,$(OBJ_PREFIX)/$(staticlib)))
+$(eval $(call add-bin-build,$(testedbin),json_test.c,-L $(OBJ_PREFIX) $(call set_links,ljson),,$(OBJ_PREFIX)/$(staticlib)))
 
 $(eval $(call add-liba-build,$(ldoublelib),ldouble.c))
-$(eval $(call add-bin-build,$(ldoublebin),ldouble_test.c,-static -L $(OBJ_PREFIX) -lldouble,,$(OBJ_PREFIX)/$(ldoublelib)))
+$(eval $(call add-bin-build,$(ldoublebin),ldouble_test.c,-L $(OBJ_PREFIX) $(call set_links,ldouble),,$(OBJ_PREFIX)/$(ldoublelib)))
 
 all: $(BIN_TARGETS) $(LIB_TARGETS)
 

README.md

@@ -66,14 +66,14 @@ Note: 'O2' optimization level and default option compilation, the test files com
 > Test Platform: Ambarella CV25M Board | CPU: ARM CortexA53 | OS: Linux-5.15<br>
 > Test Result: LJSON parses 475% faster and prints 2836% faster than cJSON, LJSON parses 131% faster and prints 147% faster than RapidJSON
 
-![AARCH64-Linux Test Result](test_result/test_for_aarch64.png)
+![AARCH64-Linux Test Result](image/test_for_aarch64.png)
 
 > Test Platform: PC | CPU: Intel i7-10700 | OS: Ubuntu 18.04 (VirtualBox)<br>
 > Test Result: LJSON parses 560% faster and prints 3184% faster than cJSON, LJSON parses 75% faster and prints 133% faster than RapidJSON
 
-![x86_64-Linux Test Result](test_result/test_for_x86_64.png)
+![x86_64-Linux Test Result](image/test_for_x86_64.png)
 
-![ldouble-x86_64 Test Result](test_result/ldb_for_x86_64.png)
+![ldouble-x86_64 Test Result](image/ldb_for_x86_64.png)
 
 ## Contact
 

README_zh-cn.md

@@ -6,7 +6,6 @@ LJSON 是一个远远快于 cJSON、大幅度快于 RapidJSON 的 C 实现的 JS
 LJSON 支持 JSON 的解析、打印、编辑，提供 DOM 和 SAX 接口，I/O 支持字符串和文件，且完全支持 nativejson-benchmark 的测试用例。
 LJSON 默认使用个人开发的 ldouble 算法打印浮点数，和标准库对比可能只有第15位小数的区别，是目前最快的浮点数转字符串算法；也可选择个人优化过的 grisu2 算法或 dragonbox 算法。
 
-
 ## 功能特点
 
 * 更快：打印和解析速度比 cJSON 和 RapidJSON 都要快，速度最高可比 CJSON 快32倍，比 Rapid JSON 快1.5倍，见测试结果
@@ -67,19 +66,19 @@ make O=<编译输出目录> CROSS_COMPILE=<交叉编译器前缀> && make O=<编
 > 测试平台: Ambarella CV25M Board | CPU: ARM CortexA53 | OS: Linux-5.15<br>
 > 测试结果: LJSON 比cJSON 解析最快可达 475%，打印最快可达 2836%，LJSON 比 RapidJSON 解析最快可达 131%，打印最快可达 147%
 
-![AARCH64-Linux测试结果](test_result/test_for_aarch64.png)
+![AARCH64-Linux测试结果](image/test_for_aarch64.png)
 
 > 测试平台: PC | CPU: Intel i7-10700 | OS: Ubuntu 18.04 (VirtualBox)<br>
 > 测试结果: LJSON 比cJSON 解析最快可达 560%，打印最快可达 3184%，LJSON 比 RapidJSON 解析最快可达 75%，打印最快可达 133%
 
-![x86_64-Linux测试结果](test_result/test_for_x86_64.png)
+![x86_64-Linux测试结果](image/test_for_x86_64.png)
 
-![ldouble-x86_64测试结果](test_result/ldb_for_x86_64.png)
+![ldouble-x86_64测试结果](image/ldb_for_x86_64.png)
 
 > 测试平台: Nationalchip STB | CPU: CSKY | DDR3: 128MB, 533MHz | OS: ECOS<br>
 > 注: 老版本测试结果，新版本删除了临时buffer，且解析速度提升了两倍
 
-![ECOS测试结果](test_result/test_for_csky.png)
+![ECOS测试结果](image/test_for_csky.png)
 
 ## json对象结构
 

test_result/ldb_for_x86_64.png image/ldb_for_x86_64.png

@@ -5,7 +5,7 @@
 # https://github.com/lengjingzju/cbuild-ng #
 ############################################
 
-############# Date: 2023-08-18 #############
+############# Date: 2023-08-28 #############
 
 # The default behavior only includes inc.env.mk and inc.ins.mk.
 # INC_MAKES can be set to a combination of `disenv` `conf` `app` `mod` `disins`.
@@ -109,7 +109,7 @@ DEP_PREFIX     := $(DEPDIR)
 endif
 
 define link_hdrs
-$(addprefix  -I,$(addprefix $(DEP_PREFIX),/include /usr/include /usr/local/include) \
+$(addprefix -I,$(addprefix $(DEP_PREFIX),/include /usr/include /usr/local/include) \
 	$(if $(SEARCH_HDRS),$(wildcard \
 	$(addprefix $(DEP_PREFIX)/include/,$(SEARCH_HDRS)) \
 	$(addprefix $(DEP_PREFIX)/usr/include/,$(SEARCH_HDRS)) \
@@ -178,6 +178,17 @@ endif
 export CROSS_COMPILE
 endif
 
+ifeq ($(COMPILER_COLLECTION),clang)
+CC             := $(CROSS_COMPILE)clang
+CPP            := $(CROSS_COMPILE)clang -E
+CXX            := $(CROSS_COMPILE)clang++
+AS             := $(CROSS_COMPILE)llvm-as
+LD             := $(CROSS_COMPILE)lld
+AR             := $(CROSS_COMPILE)llvm-ar
+RANLIB         := $(CROSS_COMPILE)llvm-ranlib
+OBJCOPY        := $(CROSS_COMPILE)llvm-objcopy
+STRIP          := $(CROSS_COMPILE)llvm-strip
+else
 CC             := $(CROSS_COMPILE)gcc
 CPP            := $(CROSS_COMPILE)gcc -E
 CXX            := $(CROSS_COMPILE)g++
@@ -187,13 +198,25 @@ AR             := $(CROSS_COMPILE)ar
 RANLIB         := $(CROSS_COMPILE)ranlib
 OBJCOPY        := $(CROSS_COMPILE)objcopy
 STRIP          := $(CROSS_COMPILE)strip
+endif
 export CC CXX CPP AS LD AR RANLIB OBJCOPY STRIP
 
 else # NATIVE_BUILD
 
 undefine ARCH CROSS_COMPILE
 unexport ARCH CROSS_COMPILE
 
+ifeq ($(COMPILER_COLLECTION),clang)
+CC             := clang
+CPP            := clang -E
+CXX            := clang++
+AS             := llvm-as
+LD             := lld
+AR             := llvm-ar
+RANLIB         := llvm-ranlib
+OBJCOPY        := llvm-objcopy
+STRIP          := llvm-strip
+else
 CC             := gcc
 CPP            := gcc -E
 CXX            := g++
@@ -203,6 +226,7 @@ AR             := ar
 RANLIB         := ranlib
 OBJCOPY        := objcopy
 STRIP          := strip
+endif
 export CC CXX CPP AS LD AR RANLIB OBJCOPY STRIP
 
 endif # NATIVE_BUILD
@@ -449,11 +473,21 @@ endif
 imake_cpflags  += $(SANITIZER_FLAG)
 imake_ldflags  += $(SANITIZER_FLAG)
 
+ifeq ($(ENV_ANALYZER),y)
+ifneq ($(filter %gcc,$(CC)), )
 # For more description, refer to https://gcc.gnu.org/onlinedocs/gcc-13.1.0/gcc/Static-Analyzer-Options.html
-ifeq ($(ENV_ANALYZER)-$(shell expr `$(CC) -dumpversion` \>= 10),y-1)
+ifeq ($(shell expr `PATH=$(PATH) $(CC) -dumpversion` \>= 10),1)
 imake_cpflags  += -fanalyzer
 imake_ldflags  += -fanalyzer
 endif
+else
+# For more description, refer to https://clang.llvm.org/docs/ClangStaticAnalyzer.html
+# clang --analyze -Xanalyzer -analyzer-checker=<package> <source-files>
+# <package> can be got from `clang -cc1 -analyzer-checker-help`
+imake_cpflags  += --analyze
+imake_ldflags  += --analyze
+endif
+endif
 
 imake_cpflags  += $(IMAKE_CPFLAGS)
 imake_ldflags  += $(IMAKE_LDFLAGS)
@@ -481,6 +515,10 @@ define set_flags
 $(foreach v,$(2),$(eval $(1)_$(patsubst %,%.o,$(basename $(v))) := $(3)))
 endef
 
+define set_links
+-Wl,-Bstatic $(addprefix -l,$(1)) -Wl,-Bdynamic $(addprefix -l,$(2))
+endef
+
 define all_ver_obj
 $(strip \
 	$(if $(word 4,$(1)), \
@@ -563,7 +601,7 @@ $$(OBJ_PREFIX)/$(1): PRIVATE_CPFLAGS := -fPIC $(4)
 $$(OBJ_PREFIX)/$(1): $$(call translate_obj,$(2)) $(3) $(5)
 	@$(COLORECHO) "\033[032mlib:\033[0m	\033[44m$$@\033[0m"
 	@rm -f $$@
-	@$$(AR) r $$@ $$(call translate_obj,$(2)) -c
+	@$$(AR) rc $$@ $$(call translate_obj,$(2))
 ifneq ($(3), )
 	@echo OPEN $$@ > [email protected] $(foreach lib,$(3),
 	@echo ADDLIB $(lib) >> [email protected])