From 18a091990a2de49fb0c9d85b0ae8e86825f2104f Mon Sep 17 00:00:00 2001 From: midipix Date: Fri, 3 Aug 2018 07:53:34 +0000 Subject: library interfaces: asm source generation: re-implement w. pure fdio and fdctx. --- src/util/mdso_create_implib_sources.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'src/util/mdso_create_implib_sources.c') diff --git a/src/util/mdso_create_implib_sources.c b/src/util/mdso_create_implib_sources.c index 5c320eb..1ee647d 100644 --- a/src/util/mdso_create_implib_sources.c +++ b/src/util/mdso_create_implib_sources.c @@ -9,6 +9,7 @@ #include #include +#include "mdso_driver_impl.h" #include "mdso_errinfo_impl.h" static void mdso_init_asmname(char * buf, const char * fmt, const char * str) @@ -24,11 +25,11 @@ static void mdso_init_asmname(char * buf, const char * fmt, const char * str) sprintf(buf,fmt,str); } -mdso_api int mdso_create_implib_sources(const struct mdso_driver_ctx * dctx) +int mdso_create_implib_sources(const struct mdso_driver_ctx * dctx) { struct mdso_unit_ctx * uctx; const char ** unit; - FILE * fout; + int fdout; char asmname[PATH_MAX]; const char * const * sym; int ret; @@ -42,13 +43,13 @@ mdso_api int mdso_create_implib_sources(const struct mdso_driver_ctx * dctx) for (sym=uctx->syms; *sym; sym++) { mdso_init_asmname(asmname,".%s_symentry.s",*sym); - if (!(fout = mdso_create_asmsrc(dctx,asmname))) + if ((fdout = mdso_create_asmsrc(dctx,asmname)) < 0) return MDSO_NESTED_ERROR(dctx); - ret = mdso_asmgen_symentry(dctx,*sym,fout); + ret = mdso_asmgen_symentry(dctx,*sym,fdout); - if (fout != stdout) - fclose(fout); + if (fdout != mdso_driver_fdout(dctx)) + close(fdout); if (ret < 0) return MDSO_NESTED_ERROR(dctx); @@ -56,13 +57,13 @@ mdso_api int mdso_create_implib_sources(const struct mdso_driver_ctx * dctx) if (uctx->stype[sym-uctx->syms] == MDSO_SYMBOL_TYPE_CODE) { mdso_init_asmname(asmname,".%s_symfn.s",*sym); - if (!(fout = mdso_create_asmsrc(dctx,asmname))) + if ((fdout = mdso_create_asmsrc(dctx,asmname)) < 0) return MDSO_NESTED_ERROR(dctx); - ret = mdso_asmgen_symfn(dctx,*sym,fout); + ret = mdso_asmgen_symfn(dctx,*sym,fdout); - if (fout != stdout) - fclose(fout); + if (fdout != mdso_driver_fdout(dctx)) + close(fdout); if (ret < 0) return MDSO_NESTED_ERROR(dctx); @@ -75,13 +76,13 @@ mdso_api int mdso_create_implib_sources(const struct mdso_driver_ctx * dctx) /* dsometa */ mdso_init_asmname(asmname,".dsometa_%s.s",dctx->cctx->libname); - if (!(fout = mdso_create_asmsrc(dctx,asmname))) + if ((fdout = mdso_create_asmsrc(dctx,asmname)) < 0) return MDSO_NESTED_ERROR(dctx); - ret = mdso_asmgen_dsometa(dctx,fout); + ret = mdso_asmgen_dsometa(dctx,fdout); - if (fout != stdout) - fclose(fout); + if (fdout != mdso_driver_fdout(dctx)) + close(fdout); return (ret < 0) ? MDSO_NESTED_ERROR(dctx) : 0; } -- cgit v1.2.3