Skip to content

Commit

Permalink
cmm bugfix: forget nlr_pop before return
Browse files Browse the repository at this point in the history
firs time use VS to modify and build with ARMCC toolchain
  • Loading branch information
RockySong committed Apr 13, 2020
1 parent c56b184 commit a48b737
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions lib/aia_cmm/cfg_mux_mgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,11 @@ static mp_obj_t _prvMux_Query(mp_obj_t userObj, const char *pszFn, int unit, con
if (nlr_push(&nlr) == 0)/*try*/ {
mp_obj_tuple_t *pTup = (mp_obj_tuple_t*) mp_obj_dict_get(s_cmm.pDict, (mp_obj_t)pStrComboKey);
if (!pMuxData) /* If this is called from Python, we ju st return the tuple data */
goto cleanup;
/* We got the pin information as a tuple: (hint str, pin str, pin object, owner object) */
{
nlr_pop();
goto cleanup;
}
/* We got the pin information as a tuple: (hint str, pin str, pin object, owner object) */
mp_obj_t objHint, objPinStr, objPinObj, objOwner;
objHint = pTup->items[0];
objPinStr = pTup->items[1];
Expand Down
Binary file modified ports/prj_vsgdb_rt1060_evk/.vs/prj_vsgdb_rt1060_evk/v16/.suo
Binary file not shown.

0 comments on commit a48b737

Please sign in to comment.