Skip to content

Commit

Permalink
cg: move dt_regset_xalloc for consistency
Browse files Browse the repository at this point in the history 
Pack it next to BPF_CALL_FUNC where possible.

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
Suggested-by: Eugene Loh <eugene.loh@oracle.com>
Reviewed-by: Kris Van Hees <kris.van.hees@oracle.com>
  • Loading branch information
@nickalcock
nickalcock committed Apr 19, 2022
1 parent cf3a3f4 commit 0599f86
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions libdtrace/dt_cg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1289,9 +1289,9 @@ dt_cg_spec_set_drainable(dt_pcb_t *pcb, dt_node_t *dnp, int idreg)

if (dt_regset_xalloc_args(drp) == -1)
longjmp(yypcb->pcb_jmpbuf, EDT_NOREG);
dt_regset_xalloc(drp, BPF_REG_0);
emit(dlp, BPF_LOAD(BPF_DW, BPF_REG_1, BPF_REG_FP, DT_STK_DCTX));
emit(dlp, BPF_MOV_REG(BPF_REG_2, idreg));
dt_regset_xalloc(drp, BPF_REG_0);
emite(dlp, BPF_CALL_FUNC(idp->di_id), idp);
emit(dlp, BPF_BRANCH_IMM(BPF_JEQ, BPF_REG_0, 0, lbl_ok));
emit(dlp, BPF_RETURN());
Expand Down Expand Up @@ -2215,9 +2215,9 @@ dt_cg_load_var(dt_node_t *dst, dt_irlist_t *dlp, dt_regset_t *drp)

emit(dlp, BPF_LOAD(BPF_DW, BPF_REG_1, BPF_REG_FP, DT_STK_DCTX));
emit(dlp, BPF_MOV_IMM(BPF_REG_2, idp->di_id));
dt_regset_xalloc(drp, BPF_REG_0);
idp = dt_dlib_get_func(yypcb->pcb_hdl, "dt_get_bvar");
assert(idp != NULL);
dt_regset_xalloc(drp, BPF_REG_0);
emite(dlp, BPF_CALL_FUNC(idp->di_id), idp);
dt_regset_free_args(drp);

Expand Down Expand Up @@ -3709,9 +3709,9 @@ dt_cg_subr_path_helper(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp,

emit(dlp, BPF_MOV_REG(BPF_REG_2, dnp->dn_reg));

dt_regset_xalloc(drp, BPF_REG_0);
idp = dt_dlib_get_func(yypcb->pcb_hdl, fname);
assert(idp != NULL);
dt_regset_xalloc(drp, BPF_REG_0);
emite(dlp, BPF_CALL_FUNC(idp->di_id), idp);
dt_regset_free_args(drp);
dt_regset_free(drp, BPF_REG_0);
Expand Down Expand Up @@ -4136,9 +4136,9 @@ dt_cg_subr_strchr(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
emit(dlp, BPF_LOAD(BPF_DW, BPF_REG_4, BPF_REG_4, DCTX_MEM));
emit(dlp, BPF_ALU64_IMM(BPF_ADD, BPF_REG_4, off));

dt_regset_xalloc(drp, BPF_REG_0);
idp = dt_dlib_get_func(yypcb->pcb_hdl, "dt_strchr");
assert(idp != NULL);
dt_regset_xalloc(drp, BPF_REG_0);
emite(dlp, BPF_CALL_FUNC(idp->di_id), idp);
dt_regset_free_args(drp);
dt_cg_tstring_xfree(yypcb, off);
Expand Down Expand Up @@ -4187,9 +4187,9 @@ dt_cg_subr_strrchr(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
emit(dlp, BPF_ALU64_IMM(BPF_ADD, dnp->dn_reg, dnp->dn_tstring->dn_value));
emit(dlp, BPF_MOV_REG(BPF_REG_3, dnp->dn_reg));

dt_regset_xalloc(drp, BPF_REG_0);
idp = dt_dlib_get_func(yypcb->pcb_hdl, "dt_strrchr");
assert(idp != NULL);
dt_regset_xalloc(drp, BPF_REG_0);
emite(dlp, BPF_CALL_FUNC(idp->di_id), idp);
dt_regset_free_args(drp);

Expand Down Expand Up @@ -4318,9 +4318,9 @@ dt_cg_subr_strstr(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
emit(dlp, BPF_ALU64_IMM(BPF_ADD, BPF_REG_4, off1));
emit(dlp, BPF_ALU64_IMM(BPF_ADD, BPF_REG_5, off2));

dt_regset_xalloc(drp, BPF_REG_0);
idp = dt_dlib_get_func(yypcb->pcb_hdl, "dt_index");
assert(idp != NULL);
dt_regset_xalloc(drp, BPF_REG_0);
emite(dlp, BPF_CALL_FUNC(idp->di_id), idp);
dt_regset_free_args(drp);

Expand Down Expand Up @@ -4507,9 +4507,9 @@ dt_cg_subr_substr(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
emit(dlp, BPF_MOV_IMM(BPF_REG_4, 0));
emit(dlp, BPF_MOV_IMM(BPF_REG_5, 2));
}
dt_regset_xalloc(drp, BPF_REG_0);
idp = dt_dlib_get_func(yypcb->pcb_hdl, "dt_substr");
assert(idp != NULL);
dt_regset_xalloc(drp, BPF_REG_0);
emite(dlp, BPF_CALL_FUNC(idp->di_id), idp);

/*
Expand Down

0 comments on commit 0599f86

Please sign in to comment.