X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debugger%2Fmcs51%2Fcmd.c;h=cd038fffea32bcf9665469ffdfa2ba1671a79186;hb=HEAD;hp=ea71bff0de0c8eef587fc9d908fba274a90e1517;hpb=3703fa637233958a6264cd8001ca2ac8880f64b1;p=fw%2Fsdcc diff --git a/debugger/mcs51/cmd.c b/debugger/mcs51/cmd.c index ea71bff0..cd038fff 100644 --- a/debugger/mcs51/cmd.c +++ b/debugger/mcs51/cmd.c @@ -1,25 +1,24 @@ /*------------------------------------------------------------------------- cmd.c - source file for debugger command execution - - Written By - Sandeep Dutta . sandeep.dutta@usa.net (1999) + Written By - Sandeep Dutta . sandeep.dutta@usa.net (1999) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - + In other words, you are welcome to use, share and improve this program. You are forbidden to forbid anyone else to use, share and improve - what you give them. Help stamp out software-hoarding! + what you give them. Help stamp out software-hoarding! -------------------------------------------------------------------------*/ #include "sdcdb.h" @@ -27,9 +26,16 @@ #include "simi.h" #include "break.h" #include "cmd.h" +#include "newalloc.h" -int listLines = 10; -EXTERN_STACK_DCL(callStack,function *,1024); +/* default number of lines to list out */ +#define LISTLINES 10 +static int listlines = LISTLINES; + +/* mainly used to retain a reference to the active module being + listed. May be used as a general context for other commands if + no better context is available */ +static module *list_mod = NULL; #if defined(__APPLE__) && defined(__MACH__) static char *copying= @@ -38,293 +44,296 @@ static char *warranty= {" NO WARRANTY"}; #else static char *copying= -" GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. -^L - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The \"Program\", below, -refers to any such program or work, and a \"work based on the Program\" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term \"modification\".) Each licensee is addressed as \"you\". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. -^L - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and \"any -later version\", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. -"; +" GNU GENERAL PUBLIC LICENSE\n" +" Version 2, June 1991\n" +"\n" +" Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n" +" 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA\n" +" Everyone is permitted to copy and distribute verbatim copies\n" +" of this license document, but changing it is not allowed.\n" +"\n" +" Preamble\n" +"\n" +" The licenses for most software are designed to take away your\n" +"freedom to share and change it. By contrast, the GNU General Public\n" +"License is intended to guarantee your freedom to share and change free\n" +"software--to make sure the software is free for all its users. This\n" +"General Public License applies to most of the Free Software\n" +"Foundation's software and to any other program whose authors commit to\n" +"using it. (Some other Free Software Foundation software is covered by\n" +"the GNU Library General Public License instead.) You can apply it to\n" +"your programs, too.\n" +"\n" +" When we speak of free software, we are referring to freedom, not\n" +"price. Our General Public Licenses are designed to make sure that you\n" +"have the freedom to distribute copies of free software (and charge for\n" +"this service if you wish), that you receive source code or can get it\n" +"if you want it, that you can change the software or use pieces of it\n" +"in new free programs; and that you know you can do these things.\n" +"\n" +" To protect your rights, we need to make restrictions that forbid\n" +"anyone to deny you these rights or to ask you to surrender the rights.\n" +"These restrictions translate to certain responsibilities for you if you\n" +"distribute copies of the software, or if you modify it.\n" +"\n" +" For example, if you distribute copies of such a program, whether\n" +"gratis or for a fee, you must give the recipients all the rights that\n" +"you have. You must make sure that they, too, receive or can get the\n" +"source code. And you must show them these terms so they know their\n" +"rights.\n" +"\n" +" We protect your rights with two steps: (1) copyright the software, and\n" +"(2) offer you this license which gives you legal permission to copy,\n" +"distribute and/or modify the software.\n" +"\n" +" Also, for each author's protection and ours, we want to make certain\n" +"that everyone understands that there is no warranty for this free\n" +"software. If the software is modified by someone else and passed on, we\n" +"want its recipients to know that what they have is not the original, so\n" +"that any problems introduced by others will not reflect on the original\n" +"authors' reputations.\n" +"\n" +" Finally, any free program is threatened constantly by software\n" +"patents. We wish to avoid the danger that redistributors of a free\n" +"program will individually obtain patent licenses, in effect making the\n" +"program proprietary. To prevent this, we have made it clear that any\n" +"patent must be licensed for everyone's free use or not licensed at all.\n" +"\n" +" The precise terms and conditions for copying, distribution and\n" +"modification follow.\n" +"^L\n" +" GNU GENERAL PUBLIC LICENSE\n" +" TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n" +"\n" +" 0. This License applies to any program or other work which contains\n" +"a notice placed by the copyright holder saying it may be distributed\n" +"under the terms of this General Public License. The \"Program\", below,\n" +"refers to any such program or work, and a \"work based on the Program\"\n" +"means either the Program or any derivative work under copyright law:\n" +"that is to say, a work containing the Program or a portion of it,\n" +"either verbatim or with modifications and/or translated into another\n" +"language. (Hereinafter, translation is included without limitation in\n" +"the term \"modification\".) Each licensee is addressed as \"you\".\n" +"\n" +"Activities other than copying, distribution and modification are not\n" +"covered by this License; they are outside its scope. The act of\n" +"running the Program is not restricted, and the output from the Program\n" +"is covered only if its contents constitute a work based on the\n" +"Program (independent of having been made by running the Program).\n" +"Whether that is true depends on what the Program does.\n" +"\n" +" 1. You may copy and distribute verbatim copies of the Program's\n" +"source code as you receive it, in any medium, provided that you\n" +"conspicuously and appropriately publish on each copy an appropriate\n" +"copyright notice and disclaimer of warranty; keep intact all the\n" +"notices that refer to this License and to the absence of any warranty;\n" +"and give any other recipients of the Program a copy of this License\n" +"along with the Program.\n" +"\n" +"You may charge a fee for the physical act of transferring a copy, and\n" +"you may at your option offer warranty protection in exchange for a fee.\n" +"\n" +" 2. You may modify your copy or copies of the Program or any portion\n" +"of it, thus forming a work based on the Program, and copy and\n" +"distribute such modifications or work under the terms of Section 1\n" +"above, provided that you also meet all of these conditions:\n" +"\n" +" a) You must cause the modified files to carry prominent notices\n" +" stating that you changed the files and the date of any change.\n" +"\n" +" b) You must cause any work that you distribute or publish, that in\n" +" whole or in part contains or is derived from the Program or any\n" +" part thereof, to be licensed as a whole at no charge to all third\n" +" parties under the terms of this License.\n" +"\n" +" c) If the modified program normally reads commands interactively\n" +" when run, you must cause it, when started running for such\n" +" interactive use in the most ordinary way, to print or display an\n" +" announcement including an appropriate copyright notice and a\n" +" notice that there is no warranty (or else, saying that you provide\n" +" a warranty) and that users may redistribute the program under\n" +" these conditions, and telling the user how to view a copy of this\n" +" License. (Exception: if the Program itself is interactive but\n" +" does not normally print such an announcement, your work based on\n" +" the Program is not required to print an announcement.)\n" +"\n" +"These requirements apply to the modified work as a whole. If\n" +"identifiable sections of that work are not derived from the Program,\n" +"and can be reasonably considered independent and separate works in\n" +"themselves, then this License, and its terms, do not apply to those\n" +"sections when you distribute them as separate works. But when you\n" +"distribute the same sections as part of a whole which is a work based\n" +"on the Program, the distribution of the whole must be on the terms of\n" +"this License, whose permissions for other licensees extend to the\n" +"entire whole, and thus to each and every part regardless of who wrote it.\n" +"\n" +"Thus, it is not the intent of this section to claim rights or contest\n" +"your rights to work written entirely by you; rather, the intent is to\n" +"exercise the right to control the distribution of derivative or\n" +"collective works based on the Program.\n" +"\n" +"In addition, mere aggregation of another work not based on the Program\n" +"with the Program (or with a work based on the Program) on a volume of\n" +"a storage or distribution medium does not bring the other work under\n" +"the scope of this License.\n" +"\n" +" 3. You may copy and distribute the Program (or a work based on it,\n" +"under Section 2) in object code or executable form under the terms of\n" +"Sections 1 and 2 above provided that you also do one of the following:\n" +"\n" +" a) Accompany it with the complete corresponding machine-readable\n" +" source code, which must be distributed under the terms of Sections\n" +" 1 and 2 above on a medium customarily used for software interchange; or,\n" +"\n" +" b) Accompany it with a written offer, valid for at least three\n" +" years, to give any third party, for a charge no more than your\n" +" cost of physically performing source distribution, a complete\n" +" machine-readable copy of the corresponding source code, to be\n" +" distributed under the terms of Sections 1 and 2 above on a medium\n" +" customarily used for software interchange; or,\n" +"\n" +" c) Accompany it with the information you received as to the offer\n" +" to distribute corresponding source code. (This alternative is\n" +" allowed only for noncommercial distribution and only if you\n" +" received the program in object code or executable form with such\n" +" an offer, in accord with Subsection b above.)\n" +"\n" +"The source code for a work means the preferred form of the work for\n" +"making modifications to it. For an executable work, complete source\n" +"code means all the source code for all modules it contains, plus any\n" +"associated interface definition files, plus the scripts used to\n" +"control compilation and installation of the executable. However, as a\n" +"special exception, the source code distributed need not include\n" +"anything that is normally distributed (in either source or binary\n" +"form) with the major components (compiler, kernel, and so on) of the\n" +"operating system on which the executable runs, unless that component\n" +"itself accompanies the executable.\n" +"\n" +"If distribution of executable or object code is made by offering\n" +"access to copy from a designated place, then offering equivalent\n" +"access to copy the source code from the same place counts as\n" +"distribution of the source code, even though third parties are not\n" +"compelled to copy the source along with the object code.\n" +"^L\n" +" 4. You may not copy, modify, sublicense, or distribute the Program\n" +"except as expressly provided under this License. Any attempt\n" +"otherwise to copy, modify, sublicense or distribute the Program is\n" +"void, and will automatically terminate your rights under this License.\n" +"However, parties who have received copies, or rights, from you under\n" +"this License will not have their licenses terminated so long as such\n" +"parties remain in full compliance.\n" +"\n" +" 5. You are not required to accept this License, since you have not\n" +"signed it. However, nothing else grants you permission to modify or\n" +"distribute the Program or its derivative works. These actions are\n" +"prohibited by law if you do not accept this License. Therefore, by\n" +"modifying or distributing the Program (or any work based on the\n" +"Program), you indicate your acceptance of this License to do so, and\n" +"all its terms and conditions for copying, distributing or modifying\n" +"the Program or works based on it.\n" +"\n" +" 6. Each time you redistribute the Program (or any work based on the\n" +"Program), the recipient automatically receives a license from the\n" +"original licensor to copy, distribute or modify the Program subject to\n" +"these terms and conditions. You may not impose any further\n" +"restrictions on the recipients' exercise of the rights granted herein.\n" +"You are not responsible for enforcing compliance by third parties to\n" +"this License.\n" +"\n" +" 7. If, as a consequence of a court judgment or allegation of patent\n" +"infringement or for any other reason (not limited to patent issues),\n" +"conditions are imposed on you (whether by court order, agreement or\n" +"otherwise) that contradict the conditions of this License, they do not\n" +"excuse you from the conditions of this License. If you cannot\n" +"distribute so as to satisfy simultaneously your obligations under this\n" +"License and any other pertinent obligations, then as a consequence you\n" +"may not distribute the Program at all. For example, if a patent\n" +"license would not permit royalty-free redistribution of the Program by\n" +"all those who receive copies directly or indirectly through you, then\n" +"the only way you could satisfy both it and this License would be to\n" +"refrain entirely from distribution of the Program.\n" +"\n" +"If any portion of this section is held invalid or unenforceable under\n" +"any particular circumstance, the balance of the section is intended to\n" +"apply and the section as a whole is intended to apply in other\n" +"circumstances.\n" +"\n" +"It is not the purpose of this section to induce you to infringe any\n" +"patents or other property right claims or to contest validity of any\n" +"such claims; this section has the sole purpose of protecting the\n" +"integrity of the free software distribution system, which is\n" +"implemented by public license practices. Many people have made\n" +"generous contributions to the wide range of software distributed\n" +"through that system in reliance on consistent application of that\n" +"system; it is up to the author/donor to decide if he or she is willing\n" +"to distribute software through any other system and a licensee cannot\n" +"impose that choice.\n" +"\n" +"This section is intended to make thoroughly clear what is believed to\n" +"be a consequence of the rest of this License.\n" +"\n" +" 8. If the distribution and/or use of the Program is restricted in\n" +"certain countries either by patents or by copyrighted interfaces, the\n" +"original copyright holder who places the Program under this License\n" +"may add an explicit geographical distribution limitation excluding\n" +"those countries, so that distribution is permitted only in or among\n" +"countries not thus excluded. In such case, this License incorporates\n" +"the limitation as if written in the body of this License.\n" +"\n" +" 9. The Free Software Foundation may publish revised and/or new versions\n" +"of the General Public License from time to time. Such new versions will\n" +"be similar in spirit to the present version, but may differ in detail to\n" +"address new problems or concerns.\n" +"\n" +"Each version is given a distinguishing version number. If the Program\n" +"specifies a version number of this License which applies to it and \"any\n" +"later version\", you have the option of following the terms and conditions\n" +"either of that version or of any later version published by the Free\n" +"Software Foundation. If the Program does not specify a version number of\n" +"this License, you may choose any version ever published by the Free Software\n" +"Foundation.\n" +"\n" +" 10. If you wish to incorporate parts of the Program into other free\n" +"programs whose distribution conditions are different, write to the author\n" +"to ask for permission. For software which is copyrighted by the Free\n" +"Software Foundation, write to the Free Software Foundation; we sometimes\n" +"make exceptions for this. Our decision will be guided by the two goals\n" +"of preserving the free status of all derivatives of our free software and\n" +"of promoting the sharing and reuse of software generally.\n"; + static char *warranty= -" NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. -"; +" NO WARRANTY\n" +"\n" +" 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n" +"FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN\n" +"OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n" +"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\n" +"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n" +"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS\n" +"TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE\n" +"PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n" +"REPAIR OR CORRECTION.\n" +"\n" +" 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n" +"WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n" +"REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n" +"INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n" +"OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n" +"TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n" +"YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n" +"PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n" +"POSSIBILITY OF SUCH DAMAGES.\n"; #endif static void printTypeInfo(link *); -static void printValAggregates (symbol *,link *,char,unsigned int); +static void printValAggregates (symbol *,link *,char,unsigned int,int,int); +static int printOrSetSymValue (symbol *sym, context *cctxt, + int flg, int dnum, int fmt, + char *rs, char *val, char cmp); int srcMode = SRC_CMODE ; - +set *dispsymbols = NULL ; /* set of displayable symbols */ +static int currentFrame = 0; /* actual displayed frame */ /*-----------------------------------------------------------------*/ /* funcWithName - returns function with name */ /*-----------------------------------------------------------------*/ @@ -335,53 +344,88 @@ DEFSETFUNC(funcWithName) V_ARG(function **,funcp); if (*funcp) - return 0; + return 0; if (strcmp(func->sym->name,name) == 0) { - *funcp = func; - return 1; + *funcp = func; + return 1; } - + + return 0; +} + +/*-----------------------------------------------------------------*/ +/* symWithAddr - look for symbol with sfr / sbit address */ +/*-----------------------------------------------------------------*/ +DEFSETFUNC(symWithAddr) +{ + symbol *sym = item; + V_ARG(unsigned long,laddr); + V_ARG(int ,laddrspace); + V_ARG(symbol **,rsym); + + if (*rsym) + return 0; + + if ( sym->addr == laddr && + sym->addrspace == laddrspace ) + { + *rsym = sym; + return 1; + } + return 0; } /*-----------------------------------------------------------------*/ /* setBPatModLine - set break point at the line specified for the */ /*-----------------------------------------------------------------*/ -static void setBPatModLine (module *mod, int line) +static void setBPatModLine (module *mod, int line, char bpType ) { + int next_line; + /* look for the first executable line after the line - specified & get the break point there */ + specified & get the break point there */ + + if ( line < 0 ) + return; + if (srcMode == SRC_CMODE && line > mod->ncLines) { - fprintf(stderr,"No line %d in file \"%s\".\n", - line,mod->c_name); - return ; + fprintf(stderr,"No line %d in file \"%s\".\n", + line,mod->c_name); + return ; } - + if (srcMode == SRC_AMODE && line > mod->nasmLines) { - fprintf(stderr,"No line %d in file \"%s\".\n", - line,mod->asm_name); - return ; + fprintf(stderr,"No line %d in file \"%s\".\n", + line,mod->asm_name); + return ; } - for ( ; line < (srcMode == SRC_CMODE ? mod->ncLines : mod->nasmLines ) ; - line++ ) { - if (srcMode == SRC_CMODE) { - if (mod->cLines[line]->addr) { - setBreakPoint (mod->cLines[line]->addr, CODE, USER, - userBpCB, mod->c_name, line); - break; - } - } - else { - if (mod->asmLines[line]->addr) { - setBreakPoint (mod->asmLines[line]->addr, CODE, USER, - userBpCB, mod->asm_name, line); - break; - } - } + next_line = line; + for ( ; next_line < (srcMode == SRC_CMODE ? mod->ncLines : mod->nasmLines ) ; + next_line++ ) { + if (srcMode == SRC_CMODE) { + if (mod->cLines[next_line]->addr != INT_MAX) { + setBreakPoint (mod->cLines[next_line]->addr, CODE, bpType, + userBpCB, mod->c_name, next_line); + return; +// break; + } + } + else { + if (mod->asmLines[next_line]->addr != INT_MAX) { + setBreakPoint (mod->asmLines[next_line]->addr, CODE, bpType, + userBpCB, mod->asm_name, next_line); + return; +// break; + } + } } + fprintf(stderr,"No line %d or after in file \"%s\"..\n", + line,mod->c_name); + return; } @@ -393,38 +437,75 @@ static void clearBPatModLine (module *mod, int line) /* look for the first executable line after the line specified & get the break point there */ if (srcMode == SRC_CMODE && line > mod->ncLines) { - fprintf(stderr,"No line %d in file \"%s\".\n", - line,mod->c_name); - return ; + fprintf(stderr,"No line %d in file \"%s\".\n", + line,mod->c_name); + return ; } - + if (srcMode == SRC_AMODE && line > mod->ncLines) { - fprintf(stderr,"No line %d in file \"%s\".\n", - line,mod->c_name); - return ; - } - - for ( ; line < (srcMode == SRC_CMODE ? mod->ncLines : mod->nasmLines ) ; - line++ ) { - if (srcMode == SRC_CMODE) - if (mod->cLines[line]->addr) { - clearUSERbp (mod->cLines[line]->addr); - break; - } - else - if (mod->asmLines[line]->addr) { - clearUSERbp (mod->asmLines[line]->addr); - break; - } + fprintf(stderr,"No line %d in file \"%s\".\n", + line,mod->c_name); + return ; + } + + for ( ; line < (srcMode == SRC_CMODE ? mod->ncLines : mod->nasmLines ) ; + line++ ) { + if (srcMode == SRC_CMODE) + if (mod->cLines[line]->addr) { + clearUSERbp (mod->cLines[line]->addr); + break; + } + else + if (mod->asmLines[line]->addr) { + clearUSERbp (mod->asmLines[line]->addr); + break; + } } return; } +/*-----------------------------------------------------------------*/ +/* moduleLineWithAddr - finds and returns a line with a given address */ +/*-----------------------------------------------------------------*/ +DEFSETFUNC(moduleLineWithAddr) +{ + module *mod = item; + int i; + + V_ARG(unsigned int,addr); + V_ARG(module **,rmod); + V_ARG(int *,line); + + if (*rmod) + return 0; + + for (i=0; i < mod->nasmLines; i++ ) + { + if ( mod->asmLines[i]->addr == addr) + { + *rmod = mod ; + if (line ) + { + *line = 0; + for ( i=0; i < mod->ncLines; i++ ) + { + if ( mod->cLines[i]->addr > addr) + break; + *line = i; + } + return 1; + } + } + } + + return 0; +} + /*-----------------------------------------------------------------*/ /* funcWithNameModule - returns functions with a name module combo */ /*-----------------------------------------------------------------*/ -DEFSETFUNC(funcWithNameModule) +DEFSETFUNC(funcWithNameModule) { function *func = item; V_ARG(char *,fname); @@ -432,12 +513,12 @@ DEFSETFUNC(funcWithNameModule) V_ARG(function **,funcp); if (*funcp) - return 0; + return 0; if (strcmp(func->sym->name,fname) == 0 && - strcmp(func->mod->c_name,mname) == 0) { - *funcp = func; - return 1; + strcmp(func->mod->c_name,mname) == 0) { + *funcp = func; + return 1; } return 0; @@ -453,17 +534,17 @@ DEFSETFUNC(funcInAddr) V_ARG(function **,funcp); if (*funcp) - return 0; + return 0; /* in the address range */ if (func->sym->addr <= addr && - func->sym->eaddr >= addr) { - - *funcp = func; - return 1; + func->sym->eaddr >= addr) { + + *funcp = func; + return 1; } - return 0; + return 0; } /*-----------------------------------------------------------------*/ @@ -472,14 +553,14 @@ DEFSETFUNC(funcInAddr) DEFSETFUNC(setStepBp) { function *func = item; - + if (func->sym && func->sym->addr ) { - - /* set the entry break point */ - setBreakPoint (func->sym->addr , CODE , STEP , - stepBpCB ,func->mod->c_name , func->entryline); - return 1; + /* set the entry break point */ + setBreakPoint (func->sym->addr , CODE , STEP , + stepBpCB ,func->mod->c_name , func->entryline); + + return 1; } return 0; @@ -493,9 +574,9 @@ DEFSETFUNC(setStepEPBp) exePoint *ep = item; V_ARG(int,bptype); V_ARG(char *,mname); - - setBreakPoint (ep->addr, CODE, bptype, - stepBpCB, mname, ep->line); + + setBreakPoint (ep->addr, CODE, bptype, + stepBpCB, mname, ep->line); return 1; } @@ -507,9 +588,9 @@ DEFSETFUNC(setNextEPBp) exePoint *ep = item; V_ARG(int,bptype); V_ARG(char *,mname); - - setBreakPoint (ep->addr, CODE, bptype, - nextBpCB, mname, ep->line); + + setBreakPoint (ep->addr, CODE, bptype, + nextBpCB, mname, ep->line); return 1; } @@ -526,126 +607,939 @@ DEFSETFUNC(lineAtAddr) /* address must be an exact match */ if (ep->addr == addr) { - *line = ep->line; - if (block) - *block = ep->block ; - if (level) - *level = ep->level ; - return 1; + *line = ep->line; + if (block) + *block = ep->block ; + if (level) + *level = ep->level ; + return 1; } return 0; - + +} + +/*-----------------------------------------------------------------*/ +/* lineNearAddr - for execution points returns the one with addr */ +/*-----------------------------------------------------------------*/ +DEFSETFUNC(lineNearAddr) +{ + exePoint *ep = item; + V_ARG(unsigned int,addr); + V_ARG(int *,line); + V_ARG(int *,block); + V_ARG(int *,level); + + /* the line in which the address is */ + if (ep->addr <= addr) { + *line = ep->line; + if (block) + *block = ep->block ; + if (level) + *level = ep->level ; + return 1; + } + + return 0; + } /*-----------------------------------------------------------------*/ /* discoverContext - find out the current context of the bp */ /*-----------------------------------------------------------------*/ -context *discoverContext (unsigned addr) +context *discoverContext (unsigned addr, function *func, context *ctxt) { - function *func = NULL; + module *mod = NULL; int line = 0; /* find the function we are in */ - if (!applyToSet(functions,funcInAddr,addr,&func)) { - fprintf(stderr, "Error?:discoverContext: cannot apply to set!\n"); - return NULL; + if (!func && !applyToSet(functions,funcInAddr,addr,&func)) { + if (!applyToSet(functions,funcWithName,"_main",&func) || + !applyToSet(modules,moduleLineWithAddr,addr,&mod,NULL)) + { + fprintf(stderr, "addr 0x%x in no module/function (runtime env?)\n",addr); + return NULL; + } + ctxt->func = func; + ctxt->addr = addr; + ctxt->modName = mod->name; + ctxt->cline = func->exitline; } - - currCtxt->func = func; - currCtxt->addr = func->laddr = addr; - currCtxt->modName = func->modName; - - /* find the c line number */ - if(applyToSet(func->cfpoints,lineAtAddr,addr, - &line,&currCtxt->block,&currCtxt->level)) - currCtxt->cline = func->lline = line; else - currCtxt->cline = func->exitline; - + { + ctxt->func = func; + ctxt->addr = func->laddr = addr; + ctxt->modName = func->modName; + + /* find the c line number */ + if(applyToSet(func->cfpoints,lineAtAddr,addr, + &line,&ctxt->block,&ctxt->level)) + ctxt->cline = func->lline = line; + else if(applyToSet(func->cfpoints,lineNearAddr,addr, + &line,&ctxt->block,&ctxt->level)) + ctxt->cline = func->lline = line; + else + ctxt->cline = -1; + } /* find the asm line number */ line = 0; if (applyToSet(func->afpoints,lineAtAddr,addr, - &line,NULL,NULL)) - currCtxt->asmline = line; + &line,NULL,NULL)) + ctxt->asmline = line; else - currCtxt->asmline = -1; - - return currCtxt ; + ctxt->asmline = -1; + + return ctxt; } +#define IS_BRANCH 1 +#define IS_CALL 2 +#define IS_RET 4 +#define IS_ADDR11 8 +#define IS_ADDR16 16 +#define IS_COND 32 + +struct instruction { + unsigned char flags; + unsigned char len; +}; + +static struct instruction instructions[] = { + [0x28] = { .flags = 0, .len = 1 }, /* ADD A,Rn */ + [0x29] = { .flags = 0, .len = 1 }, /* ADD A,Rn */ + [0x2A] = { .flags = 0, .len = 1 }, /* ADD A,Rn */ + [0x2B] = { .flags = 0, .len = 1 }, /* ADD A,Rn */ + [0x2C] = { .flags = 0, .len = 1 }, /* ADD A,Rn */ + [0x2D] = { .flags = 0, .len = 1 }, /* ADD A,Rn */ + [0x2E] = { .flags = 0, .len = 1 }, /* ADD A,Rn */ + [0x2F] = { .flags = 0, .len = 1 }, /* ADD A,Rn */ + [0x25] = { .flags = 0, .len = 2 }, /* ADD A,direct */ + [0x26] = { .flags = 0, .len = 1 }, /* ADD A,@Ri */ + [0x27] = { .flags = 0, .len = 1 }, /* ADD A,@Ri */ + [0x24] = { .flags = 0, .len = 2 }, /* ADD A,#data */ + + [0x38] = { .flags = 0, .len = 1 }, /* ADDC A,Rn */ + [0x39] = { .flags = 0, .len = 1 }, /* ADDC A,Rn */ + [0x3A] = { .flags = 0, .len = 1 }, /* ADDC A,Rn */ + [0x3B] = { .flags = 0, .len = 1 }, /* ADDC A,Rn */ + [0x3C] = { .flags = 0, .len = 1 }, /* ADDC A,Rn */ + [0x3D] = { .flags = 0, .len = 1 }, /* ADDC A,Rn */ + [0x3E] = { .flags = 0, .len = 1 }, /* ADDC A,Rn */ + [0x3F] = { .flags = 0, .len = 1 }, /* ADDC A,Rn */ + [0x35] = { .flags = 0, .len = 2 }, /* ADDC A,direct */ + [0x36] = { .flags = 0, .len = 1 }, /* ADDC A,@Ri */ + [0x37] = { .flags = 0, .len = 1 }, /* ADDC A,@Ri */ + [0x34] = { .flags = 0, .len = 2 }, /* ADDC A,#data */ + + [0x98] = { .flags = 0, .len = 1 }, /* SUBB A,Rn */ + [0x99] = { .flags = 0, .len = 1 }, /* SUBB A,Rn */ + [0x9A] = { .flags = 0, .len = 1 }, /* SUBB A,Rn */ + [0x9B] = { .flags = 0, .len = 1 }, /* SUBB A,Rn */ + [0x9C] = { .flags = 0, .len = 1 }, /* SUBB A,Rn */ + [0x9D] = { .flags = 0, .len = 1 }, /* SUBB A,Rn */ + [0x9E] = { .flags = 0, .len = 1 }, /* SUBB A,Rn */ + [0x9F] = { .flags = 0, .len = 1 }, /* SUBB A,Rn */ + [0x95] = { .flags = 0, .len = 2 }, /* SUBB A,direct */ + [0x96] = { .flags = 0, .len = 1 }, /* SUBB A,@Ri */ + [0x97] = { .flags = 0, .len = 1 }, /* SUBB A,@Ri */ + [0x94] = { .flags = 0, .len = 2 }, /* SUBB A,#data */ + + [0x08] = { .flags = 0, .len = 1 }, /* INC Rn */ + [0x09] = { .flags = 0, .len = 1 }, /* INC Rn */ + [0x0A] = { .flags = 0, .len = 1 }, /* INC Rn */ + [0x0B] = { .flags = 0, .len = 1 }, /* INC Rn */ + [0x0C] = { .flags = 0, .len = 1 }, /* INC Rn */ + [0x0D] = { .flags = 0, .len = 1 }, /* INC Rn */ + [0x0E] = { .flags = 0, .len = 1 }, /* INC Rn */ + [0x0F] = { .flags = 0, .len = 1 }, /* INC Rn */ + [0x05] = { .flags = 0, .len = 2 }, /* INC direct */ + [0x06] = { .flags = 0, .len = 1 }, /* INC @Ri */ + [0x07] = { .flags = 0, .len = 1 }, /* INC @Ri */ + [0x04] = { .flags = 0, .len = 1 }, /* INC A */ + + [0xA3] = { .flags = 0, .len = 1 }, /* INC DPTR */ + + [0x18] = { .flags = 0, .len = 1 }, /* DEC Rn */ + [0x19] = { .flags = 0, .len = 1 }, /* DEC Rn */ + [0x1A] = { .flags = 0, .len = 1 }, /* DEC Rn */ + [0x1B] = { .flags = 0, .len = 1 }, /* DEC Rn */ + [0x1C] = { .flags = 0, .len = 1 }, /* DEC Rn */ + [0x1D] = { .flags = 0, .len = 1 }, /* DEC Rn */ + [0x1E] = { .flags = 0, .len = 1 }, /* DEC Rn */ + [0x1F] = { .flags = 0, .len = 1 }, /* DEC Rn */ + [0x15] = { .flags = 0, .len = 2 }, /* DEC direct */ + [0x16] = { .flags = 0, .len = 1 }, /* DEC @Ri */ + [0x17] = { .flags = 0, .len = 1 }, /* DEC @Ri */ + [0x14] = { .flags = 0, .len = 1 }, /* DEC A */ + + [0xA4] = { .flags = 0, .len = 1 }, /* MUL AB */ + [0x84] = { .flags = 0, .len = 1 }, /* DIV AB */ + + [0xD4] = { .flags = 0, .len = 1 }, /* DA A */ + + [0x58] = { .flags = 0, .len = 1 }, /* ANL A,Rn */ + [0x59] = { .flags = 0, .len = 1 }, /* ANL A,Rn */ + [0x5A] = { .flags = 0, .len = 1 }, /* ANL A,Rn */ + [0x5B] = { .flags = 0, .len = 1 }, /* ANL A,Rn */ + [0x5C] = { .flags = 0, .len = 1 }, /* ANL A,Rn */ + [0x5D] = { .flags = 0, .len = 1 }, /* ANL A,Rn */ + [0x5E] = { .flags = 0, .len = 1 }, /* ANL A,Rn */ + [0x5F] = { .flags = 0, .len = 1 }, /* ANL A,Rn */ + [0x55] = { .flags = 0, .len = 2 }, /* ANL A,direct */ + [0x56] = { .flags = 0, .len = 1 }, /* ANL A,@Ri */ + [0x57] = { .flags = 0, .len = 1 }, /* ANL A,@Ri */ + [0x54] = { .flags = 0, .len = 2 }, /* ANL A,#data */ + [0x52] = { .flags = 0, .len = 2 }, /* ANL direct,A */ + [0x53] = { .flags = 0, .len = 3 }, /* ANL direct,#data */ + + [0x48] = { .flags = 0, .len = 1 }, /* ORL A,Rn */ + [0x49] = { .flags = 0, .len = 1 }, /* ORL A,Rn */ + [0x4A] = { .flags = 0, .len = 1 }, /* ORL A,Rn */ + [0x4B] = { .flags = 0, .len = 1 }, /* ORL A,Rn */ + [0x4C] = { .flags = 0, .len = 1 }, /* ORL A,Rn */ + [0x4D] = { .flags = 0, .len = 1 }, /* ORL A,Rn */ + [0x4E] = { .flags = 0, .len = 1 }, /* ORL A,Rn */ + [0x4F] = { .flags = 0, .len = 1 }, /* ORL A,Rn */ + [0x45] = { .flags = 0, .len = 2 }, /* ORL A,direct */ + [0x46] = { .flags = 0, .len = 1 }, /* ORL A,@Ri */ + [0x47] = { .flags = 0, .len = 1 }, /* ORL A,@Ri */ + [0x44] = { .flags = 0, .len = 2 }, /* ORL A,#data */ + [0x42] = { .flags = 0, .len = 2 }, /* ORL direct,A */ + [0x43] = { .flags = 0, .len = 3 }, /* ORL direct,#data */ + + [0x68] = { .flags = 0, .len = 1 }, /* XRL A,Rn */ + [0x69] = { .flags = 0, .len = 1 }, /* XRL A,Rn */ + [0x6A] = { .flags = 0, .len = 1 }, /* XRL A,Rn */ + [0x6B] = { .flags = 0, .len = 1 }, /* XRL A,Rn */ + [0x6C] = { .flags = 0, .len = 1 }, /* XRL A,Rn */ + [0x6D] = { .flags = 0, .len = 1 }, /* XRL A,Rn */ + [0x6E] = { .flags = 0, .len = 1 }, /* XRL A,Rn */ + [0x6F] = { .flags = 0, .len = 1 }, /* XRL A,Rn */ + [0x65] = { .flags = 0, .len = 2 }, /* XRL A,direct */ + [0x66] = { .flags = 0, .len = 1 }, /* XRL A,@Ri */ + [0x67] = { .flags = 0, .len = 1 }, /* XRL A,@Ri */ + [0x64] = { .flags = 0, .len = 2 }, /* XRL A,#data */ + [0x62] = { .flags = 0, .len = 2 }, /* XRL direct,A */ + [0x63] = { .flags = 0, .len = 3 }, /* XRL direct,#data */ + + [0xE4] = { .flags = 0, .len = 1 }, /* CLR A */ + [0xF4] = { .flags = 0, .len = 1 }, /* CPL A */ + + [0x23] = { .flags = 0, .len = 1 }, /* RL A */ + [0x33] = { .flags = 0, .len = 1 }, /* RLC A */ + [0x03] = { .flags = 0, .len = 1 }, /* RR A */ + [0x13] = { .flags = 0, .len = 1 }, /* RRC A */ + + [0xC4] = { .flags = 0, .len = 1 }, /* SWAP A */ + + [0xE8] = { .flags = 0, .len = 1 }, /* MOV A,Rn */ + [0xE9] = { .flags = 0, .len = 1 }, /* MOV A,Rn */ + [0xEA] = { .flags = 0, .len = 1 }, /* MOV A,Rn */ + [0xEB] = { .flags = 0, .len = 1 }, /* MOV A,Rn */ + [0xEC] = { .flags = 0, .len = 1 }, /* MOV A,Rn */ + [0xED] = { .flags = 0, .len = 1 }, /* MOV A,Rn */ + [0xEE] = { .flags = 0, .len = 1 }, /* MOV A,Rn */ + [0xEF] = { .flags = 0, .len = 1 }, /* MOV A,Rn */ + [0xE5] = { .flags = 0, .len = 2 }, /* MOV A,direct */ + [0xE6] = { .flags = 0, .len = 1 }, /* MOV A,@Ri */ + [0xE7] = { .flags = 0, .len = 1 }, /* MOV A,@Ri */ + [0x74] = { .flags = 0, .len = 2 }, /* MOV A,#data */ + + [0xF8] = { .flags = 0, .len = 1 }, /* MOV Rn,A */ + [0xF9] = { .flags = 0, .len = 1 }, /* MOV Rn,A */ + [0xFA] = { .flags = 0, .len = 1 }, /* MOV Rn,A */ + [0xFB] = { .flags = 0, .len = 1 }, /* MOV Rn,A */ + [0xFC] = { .flags = 0, .len = 1 }, /* MOV Rn,A */ + [0xFD] = { .flags = 0, .len = 1 }, /* MOV Rn,A */ + [0xFE] = { .flags = 0, .len = 1 }, /* MOV Rn,A */ + [0xFF] = { .flags = 0, .len = 1 }, /* MOV Rn,A */ + + [0xA8] = { .flags = 0, .len = 2 }, /* MOV Rn,direct */ + [0xA9] = { .flags = 0, .len = 2 }, /* MOV Rn,direct */ + [0xAA] = { .flags = 0, .len = 2 }, /* MOV Rn,direct */ + [0xAB] = { .flags = 0, .len = 2 }, /* MOV Rn,direct */ + [0xAC] = { .flags = 0, .len = 2 }, /* MOV Rn,direct */ + [0xAD] = { .flags = 0, .len = 2 }, /* MOV Rn,direct */ + [0xAE] = { .flags = 0, .len = 2 }, /* MOV Rn,direct */ + [0xAF] = { .flags = 0, .len = 2 }, /* MOV Rn,direct */ + + [0x78] = { .flags = 0, .len = 2 }, /* MOV Rn,#data */ + [0x79] = { .flags = 0, .len = 2 }, /* MOV Rn,#data */ + [0x7A] = { .flags = 0, .len = 2 }, /* MOV Rn,#data */ + [0x7B] = { .flags = 0, .len = 2 }, /* MOV Rn,#data */ + [0x7C] = { .flags = 0, .len = 2 }, /* MOV Rn,#data */ + [0x7D] = { .flags = 0, .len = 2 }, /* MOV Rn,#data */ + [0x7E] = { .flags = 0, .len = 2 }, /* MOV Rn,#data */ + [0x7F] = { .flags = 0, .len = 2 }, /* MOV Rn,#data */ + + [0xF5] = { .flags = 0, .len = 2 }, /* MOV direct,A */ + [0x88] = { .flags = 0, .len = 2 }, /* MOV direct,Rn */ + [0x89] = { .flags = 0, .len = 2 }, /* MOV direct,Rn */ + [0x8A] = { .flags = 0, .len = 2 }, /* MOV direct,Rn */ + [0x8B] = { .flags = 0, .len = 2 }, /* MOV direct,Rn */ + [0x8C] = { .flags = 0, .len = 2 }, /* MOV direct,Rn */ + [0x8D] = { .flags = 0, .len = 2 }, /* MOV direct,Rn */ + [0x8E] = { .flags = 0, .len = 2 }, /* MOV direct,Rn */ + [0x8F] = { .flags = 0, .len = 2 }, /* MOV direct,Rn */ + [0x85] = { .flags = 0, .len = 3 }, /* MOV direct,direct */ + [0x86] = { .flags = 0, .len = 2 }, /* MOV direct,@Ri */ + [0x87] = { .flags = 0, .len = 2 }, /* MOV direct,@Ri */ + [0x75] = { .flags = 0, .len = 3 }, /* MOV direct,#data */ + + [0xF6] = { .flags = 0, .len = 1 }, /* MOV @Ri,A */ + [0xF7] = { .flags = 0, .len = 1 }, /* MOV @Ri,A */ + [0xA6] = { .flags = 0, .len = 2 }, /* MOV @Ri,direct */ + [0xA7] = { .flags = 0, .len = 2 }, /* MOV @Ri,direct */ + [0x76] = { .flags = 0, .len = 2 }, /* MOV @Ri,#data */ + [0x77] = { .flags = 0, .len = 2 }, /* MOV @Ri,#data */ + + + [0x90] = { .flags = 0, .len = 3 }, /* MOV DPTR,#data16 */ + + [0x93] = { .flags = 0, .len = 1 }, /* MOVC A,@A+DPTR */ + [0x83] = { .flags = 0, .len = 1 }, /* MOVC A,@A+PC */ + + [0xE2] = { .flags = 0, .len = 1 }, /* MOVX A,@Ri */ + [0xE3] = { .flags = 0, .len = 1 }, /* MOVX A,@Ri */ + [0xE0] = { .flags = 0, .len = 1 }, /* MOVX A,@DPTR */ + [0xF2] = { .flags = 0, .len = 1 }, /* MOVX @Ri,A */ + [0xF3] = { .flags = 0, .len = 1 }, /* MOVX @Ri,A */ + [0xF0] = { .flags = 0, .len = 1 }, /* MOVX @DPTR,A */ + + [0xC0] = { .flags = 0, .len = 2 }, /* PUSH direct */ + [0xD0] = { .flags = 0, .len = 2 }, /* POP direct */ + [0xF5] = { .flags = 0, .len = 2 }, /* MOV direct,A */ + [0xF5] = { .flags = 0, .len = 2 }, /* MOV direct,A */ + [0xF5] = { .flags = 0, .len = 2 }, /* MOV direct,A */ + [0xF5] = { .flags = 0, .len = 2 }, /* MOV direct,A */ + + [0xC8] = { .flags = 0, .len = 1 }, /* XCH A,Rn */ + [0xC9] = { .flags = 0, .len = 1 }, /* XCH A,Rn */ + [0xCA] = { .flags = 0, .len = 1 }, /* XCH A,Rn */ + [0xCB] = { .flags = 0, .len = 1 }, /* XCH A,Rn */ + [0xCC] = { .flags = 0, .len = 1 }, /* XCH A,Rn */ + [0xCD] = { .flags = 0, .len = 1 }, /* XCH A,Rn */ + [0xCE] = { .flags = 0, .len = 1 }, /* XCH A,Rn */ + [0xCF] = { .flags = 0, .len = 1 }, /* XCH A,Rn */ + [0xC5] = { .flags = 0, .len = 2 }, /* XCH A,direct */ + [0xC6] = { .flags = 0, .len = 1 }, /* XCH A,@Ri */ + [0xC7] = { .flags = 0, .len = 1 }, /* XCH A,@Ri */ + [0xD6] = { .flags = 0, .len = 1 }, /* XCHD A,@Ri */ + [0xD7] = { .flags = 0, .len = 1 }, /* XCHD A,@Ri */ + + [0x11] = { .flags = IS_CALL, .len = 2 }, /* ACALL addr11 */ + [0x31] = { .flags = IS_CALL, .len = 2 }, /* ACALL addr11 */ + [0x51] = { .flags = IS_CALL, .len = 2 }, /* ACALL addr11 */ + [0x71] = { .flags = IS_CALL, .len = 2 }, /* ACALL addr11 */ + [0x91] = { .flags = IS_CALL, .len = 2 }, /* ACALL addr11 */ + [0xb1] = { .flags = IS_CALL, .len = 2 }, /* ACALL addr11 */ + [0xd1] = { .flags = IS_CALL, .len = 2 }, /* ACALL addr11 */ + [0xf1] = { .flags = IS_CALL, .len = 2 }, /* ACALL addr11 */ + [0x12] = { .flags = IS_CALL, .len = 3 }, /* LCALL addr16 */ + + [0x22] = { .flags = IS_RET, .len = 1 }, /* RET */ + [0x32] = { .flags = IS_RET, .len = 1 }, /* RETI */ + + [0x01] = { .flags = IS_BRANCH, .len = 2 }, /* AJMP addr11 */ + [0x21] = { .flags = IS_BRANCH, .len = 2 }, /* AJMP addr11 */ + [0x41] = { .flags = IS_BRANCH, .len = 2 }, /* AJMP addr11 */ + [0x61] = { .flags = IS_BRANCH, .len = 2 }, /* AJMP addr11 */ + [0x81] = { .flags = IS_BRANCH, .len = 2 }, /* AJMP addr11 */ + [0xa1] = { .flags = IS_BRANCH, .len = 2 }, /* AJMP addr11 */ + [0xc1] = { .flags = IS_BRANCH, .len = 2 }, /* AJMP addr11 */ + [0xe1] = { .flags = IS_BRANCH, .len = 2 }, /* AJMP addr11 */ + [0x02] = { .flags = IS_BRANCH, .len = 3 }, /* LJMP addr16 */ + + [0x80] = { .flags = IS_BRANCH, .len = 2 }, /* SJMP rel */ + + [0x73] = { .flags = IS_BRANCH, .len = 1 }, /* JMP @A+DPTR */ + + [0x60] = { .flags = IS_BRANCH, .len = 2 }, /* JZ rel */ + [0x70] = { .flags = IS_BRANCH, .len = 2 }, /* JNZ rel */ + [0x40] = { .flags = IS_BRANCH, .len = 2 }, /* JC rel */ + [0x50] = { .flags = IS_BRANCH, .len = 2 }, /* JNC rel */ + [0x20] = { .flags = IS_BRANCH, .len = 3 }, /* JB bit,rel */ + [0x30] = { .flags = IS_BRANCH, .len = 3 }, /* JNB bit,rel */ + [0x10] = { .flags = IS_BRANCH, .len = 3 }, /* JBC bit,direct rel */ + + [0xB5] = { .flags = IS_BRANCH, .len = 3 }, /* CJNE A,direct rel */ + [0xB4] = { .flags = IS_BRANCH, .len = 3 }, /* CJNE A,#data rel */ + [0xB8] = { .flags = IS_BRANCH, .len = 3 }, /* CJNE Rn,#data rel */ + [0xB9] = { .flags = IS_BRANCH, .len = 3 }, /* CJNE Rn,#data rel */ + [0xBA] = { .flags = IS_BRANCH, .len = 3 }, /* CJNE Rn,#data rel */ + [0xBB] = { .flags = IS_BRANCH, .len = 3 }, /* CJNE Rn,#data rel */ + [0xBC] = { .flags = IS_BRANCH, .len = 3 }, /* CJNE Rn,#data rel */ + [0xBD] = { .flags = IS_BRANCH, .len = 3 }, /* CJNE Rn,#data rel */ + [0xBE] = { .flags = IS_BRANCH, .len = 3 }, /* CJNE Rn,#data rel */ + [0xBF] = { .flags = IS_BRANCH, .len = 3 }, /* CJNE Rn,#data rel */ + [0xB6] = { .flags = IS_BRANCH, .len = 3 }, /* CJNE @Ri,direct rel */ + [0xB7] = { .flags = IS_BRANCH, .len = 3 }, /* CJNE @Ri,direct rel */ + + [0xD8] = { .flags = IS_BRANCH, .len = 2 }, /* DNJZ Rn,rel */ + [0xD9] = { .flags = IS_BRANCH, .len = 2 }, /* DNJZ Rn,rel */ + [0xDA] = { .flags = IS_BRANCH, .len = 2 }, /* DNJZ Rn,rel */ + [0xDB] = { .flags = IS_BRANCH, .len = 2 }, /* DNJZ Rn,rel */ + [0xDC] = { .flags = IS_BRANCH, .len = 2 }, /* DNJZ Rn,rel */ + [0xDD] = { .flags = IS_BRANCH, .len = 2 }, /* DNJZ Rn,rel */ + [0xDE] = { .flags = IS_BRANCH, .len = 2 }, /* DNJZ Rn,rel */ + [0xDF] = { .flags = IS_BRANCH, .len = 2 }, /* DNJZ Rn,rel */ + [0xD5] = { .flags = IS_BRANCH, .len = 3 }, /* DNJZ direct,rel */ + + [0x00] = { .flags = 0, .len = 1 }, /* NOP */ + + [0xC3] = { .flags = 0, .len = 1 }, /* CLR C */ + [0xC2] = { .flags = 0, .len = 2 }, /* CLR bit */ + [0xD3] = { .flags = 0, .len = 1 }, /* SETB C */ + [0xD2] = { .flags = 0, .len = 2 }, /* SETB bit */ + + [0xB3] = { .flags = 0, .len = 1 }, /* CPL C */ + [0xB2] = { .flags = 0, .len = 2 }, /* CPL bit */ + + [0x82] = { .flags = 0, .len = 2 }, /* ANL C,bit */ + [0xB0] = { .flags = 0, .len = 2 }, /* ANL C,/bit */ + [0x72] = { .flags = 0, .len = 2 }, /* ORL C,bit */ + [0xA0] = { .flags = 0, .len = 2 }, /* ORL C,/bit */ + + [0xA2] = { .flags = 0, .len = 2 }, /* MOV C,bit */ + [0x92] = { .flags = 0, .len = 2 }, /* MOV bit,C */ + + [0xA5] = { .flags = 0, .len = 1 }, /* TRAP */ +}; + +#define RET 0x22 +#define RETI 0x32 + +#define PUSH 0xC0 +#define POP 0xD0 +#define MOV_direct_A 0xF5 +#define MOV_A_direct 0xE5 +#define ADD_A_imm 0x24 +#define SP 0x81 +#define RET 0x22 +#define RETI 0x32 +#define LJMP_addr16 0x02 +#define SJMP_rel 0x80 + +static int stack_change(unsigned addr) +{ + unsigned char insn; + unsigned char direct; + + insn = simGetValue(addr, 'C', 1); + switch (insn) { + case PUSH: + return 1; + case POP: + return -1; + case MOV_direct_A: + direct = simGetValue(addr+1, 'C', 1); + if (direct == SP) { + unsigned char add_insn; + unsigned char add_direct; + + add_insn = simGetValue(addr-2, 'C', 1); + if (add_insn == ADD_A_imm) { + add_direct = simGetValue(addr-1, 'C', 1); + return (signed char) add_direct; + } + } + break; + case RET: + return 0; + case RETI: + return 1; + default: + return 0; + } +} + +static void +do_indent(int indent); + +#if 1 +#define DPC(x) +#else +#define DPC(x) do { do_indent(indent); printf x; } while (0); +#endif + +static int pc_change(unsigned addr, unsigned addrs[2], int indent) +{ + unsigned char insn; + unsigned new_addr; + signed char delta; + int len; + + insn = simGetValue(addr, 'C', 1); + if (instructions[insn].flags & IS_RET) + return 0; + + if (!(instructions[insn].flags & IS_BRANCH)) { + addrs[0] = addr + instructions[insn].len; + return 1; + } + + if (insn == LJMP_addr16) { + addrs[0] = ((simGetValue(addr+1, 'C', 1) << 8) | + (simGetValue(addr+2, 'C', 1))); + DPC(("0x%04x LJMP 0x%04x\n", addr, addrs[0])); + return 1; + } + + /* AJMP */ + if ((insn & 0x1f) == 0x01) { + unsigned char direct = simGetValue(addr+1,'C', 1); + + addrs[0] = ((addr + 2) & 0xf800) | ((insn & 0xe0) << 3) | direct; + DPC(("0x%04x AJMP 0x%04x\n", addr, addrs[0])); + return 1; + } + + /* otherwise, relative branch */ + len = instructions[insn].len; + + delta = (signed char) simGetValue(addr+len-1, 'C', 1); + new_addr = (addr + len) + delta; + + if (insn == SJMP_rel || (addr + len) == new_addr) { + addrs[0] = new_addr; + DPC(("0x%04x SJMP 0x%04x\n", addr, addrs[0])); + return 1; + } + addrs[0] = (addr + len) & 0xffff; + addrs[1] = new_addr & 0xffff; + + DPC(("0x%04x SJMP 0x%04x 0x%04x\n", addr, addrs[0], addrs[1])); + return 2; +} + +#define SEARCH_LOOP 0x8000 +#define SEARCH_EXPIRED 0x8001 + +#define MAX_STACK_BRANCH_TRACE 8192 +static unsigned stack_branch_trace[MAX_STACK_BRANCH_TRACE]; + +static int +been_here(unsigned pc, int ntrace) +{ + int t; + + for (t = 0; t < ntrace; t++) + if (stack_branch_trace[t] == pc) + return 1; + return 0; +} + +#define MAX_SEARCH 100 + +#define indent (MAX_SEARCH - search) + +static int +stack_depth(unsigned pc, int search, int ntrace) +{ + unsigned new_pc[2]; + int d[2]; + int n; + int s; + int change; + + change = 0; + for (;;) { + change += stack_change(pc); + n = pc_change(pc, new_pc, MAX_SEARCH - search); + if (n == 0) + return change; + if (n != 1) + break; + if (new_pc[0] <= pc) { + if (been_here(pc, ntrace)) { + DPC(("0x%04x loop 1\n", pc)); + return SEARCH_LOOP; + } + stack_branch_trace[ntrace++] = pc; + } + pc = new_pc[0]; + } + + if (search == 0) { + DPC(("0x%04x max depth\n", pc)); + return SEARCH_EXPIRED; + } + + if (been_here(pc, ntrace)) + { + DPC(("0x%04x loop 2\n", pc)); + return SEARCH_LOOP; + } + stack_branch_trace[ntrace++] = pc; + + for (s = 0; s < search - 1; s++) { + int i, j, d; + + i = 0; + while (i < n) { + d = stack_depth(new_pc[i], search-1, ntrace); + if (d == SEARCH_LOOP) { + for (j = i; j < n-1; j++) + new_pc[j] = new_pc[j+1]; + n--; + continue; + } + if (d != SEARCH_EXPIRED) { + DPC(("success %d\n", d + change)); + return d + change; + } + i++; + } + if (n == 0) { + DPC(("0x%04x loop 3\n", pc)); + return SEARCH_LOOP; + } + } + DPC(("search expired\n")); + return SEARCH_EXPIRED; +} + +#undef indent + +unsigned int +stack_start(void) +{ + symbol *start_stack = symLookup("__start_stack", NULL); + if (start_stack) + return start_stack->addr; + return 0x8; +} + +static int +frameStart(unsigned int *bpp, unsigned int *pcp) +{ + unsigned int bp; + unsigned int sp; + unsigned int pc; + int depth; + symbol *bp_sym; + + pc = simGetPC(); + sp = simGetValue(0x81,'I',1); + depth = stack_depth(pc, MAX_SEARCH, 0); + if (depth == SEARCH_LOOP || depth == SEARCH_EXPIRED) + bp = 0; + else + bp = sp + depth; + *bpp = bp; + *pcp = pc; + return 1; +} + +static int +frameNext(unsigned int *bpp, unsigned int *pcp) +{ + unsigned int bp = *bpp; + unsigned int pc; + int depth; + symbol *start_stack; + + if (bp < stack_start()) + return 0; + pc = simGetValue(bp - 1, 'B', 2); + if (pc == 0xffff) + return 0; + depth = stack_depth(pc, MAX_SEARCH, 0); + if (depth == SEARCH_LOOP || depth == SEARCH_EXPIRED) + bp = 0; + else + bp = bp - 2 + depth; + *bpp = bp; + *pcp = pc; + return 1; +} + +static int running = 0; + +static int is_running(void) { + return running; +} + +static int set_running(int run) { + running = run; +} /*-----------------------------------------------------------------*/ /* simGo - send 'go' cmd to simulator and wait till a break occurs */ /*-----------------------------------------------------------------*/ void simGo (unsigned int gaddr) -{ +{ unsigned int addr ; context *ctxt; int rv; - static int initial_break_flag = 0; - - top: + stopCommandList(); + top: + if ( userinterrupt ) + { + userinterrupt = 0; + return; + } +#if 0 + if ( gaddr == 0 ) + { + function *func = NULL;; + if (applyToSet(functions,funcInAddr,gaddr,&func)) + STACK_PUSH(callStack,func); + } +#endif addr = simGoTillBp (gaddr); /* got the pc for the break point now first - discover the program context i.e. module, function + discover the program context i.e. module, function linenumber of the source etc, etc etc */ - ctxt = discoverContext (addr); - - /* dispatch all the break point call back functions */ - rv = dispatchCB (addr,ctxt); + currentFrame = 0; + ctxt = discoverContext (addr, NULL, currCtxt); - ret: + /* dispatch all the break point call back functions */ + rv = dispatchCB (addr,ctxt); /* the dispatch call back function will return non-zero if an user break point has been hit - if not then we continue with the execution + if not then we continue with the execution of the program */ - if (!rv) { - if (!initial_break_flag) { - initial_break_flag = 1; // kludge to stop only at first run - fprintf(stdout, "Stopping at entry. You can now list and set breakpoints\n"); - } - else { - gaddr = -1; - goto top ; - } + if (!rv) + { + if ( gaddr == 0 ) + gaddr = -1; + if ( gaddr == -1 || doingSteps == 1 ) + goto top ; + } + +} -// notes: kpb -// I took this out, after running "run" it would just keep re-running -// even after a lot of break points hit. For some reason above code -// not triggering(dispatchCB). This seems to be by design, startup adds -// a bunch of breakpoints-but they are not USER breakpoints. Perhaps the -// debugger changed with its implementation of "go"("run"). It seems we -// need to add a "next" or "step" followed by a "run"... -// I added a "step" in simi.c when we want a resume function, this seems -// to work. +/*-----------------------------------------------------------------*/ +/* preparePrint - common parse function for set variable, */ +/* output, print and display */ +/*-----------------------------------------------------------------*/ +static char *preparePrint(char *s, context *cctxt, int *fmt, symbol **sym) +{ + char *bp; + char save_ch ; + int ptr = 0; + + *fmt = FMT_NON; + *sym = NULL; + + s = trim(s); + if (!*s) + return (char *)0; + + if ( *s == '/' ) + { + /* format of printout */ + switch ( *++s ) + { + case 'x': + *fmt = FMT_HEX ; + break; + case 'o': + *fmt = FMT_OCT ; + break; + default: + case 'd': + *fmt = FMT_DEZ ; + break; + case 't': + *fmt = FMT_BIN ; + break; + } + s++; + s = trim_left(s); + } + while (*s == '*') { + ptr++; + s++; + } + for ( bp = s; *bp && ( isalnum( *bp ) || *bp == '_' || *bp == '$'); bp++ ); + save_ch = *bp; + if ( *bp ) + *bp = '\0'; + + if ( *s ) + *sym = symLookup(s,cctxt); + *bp = save_ch; + while (ptr--) + strcat(bp,"*"); + + if ( ! *sym ) + fprintf(stdout,"No symbol \"%s\" in current context.\n", s); + return bp; +} + +static int printAsmLine( function *func, module *m, unsigned saddr, unsigned eaddr) +{ + int i,j,delta; + unsigned symaddr; + unsigned lastaddr = saddr+1; + char *symname; + + if ( func ) + { + symaddr = func->sym->addr; + symname = func->sym->name; + } + else + { + symaddr = saddr; + symname = "" ; + } + for (j=0,i=0; i < m->nasmLines; i++ ) + { + if ( saddr >= 0 && m->asmLines[i]->addr < saddr) + { + continue; + } + if ( eaddr >= 0 && m->asmLines[i]->addr > eaddr) + { + continue; + } + if ( func && + (m->asmLines[i]->addr < func->sym->addr || + m->asmLines[i]->addr > func->sym->eaddr )) + { + continue; + } + delta = m->asmLines[i]->addr - symaddr; + if ( delta >= 0 ) + { + j++; + lastaddr = m->asmLines[i]->addr; + printf("0x%08x <%s",lastaddr,symname); + if (delta > 0) printf("+%d",delta); + printf(">:\t%s",m->asmLines[i]->src); + } + } + return lastaddr; +} + +/*-----------------------------------------------------------------*/ +/* cmdDisasm - disassemble asm instruction */ +/*-----------------------------------------------------------------*/ +static int cmdDisasm (char *s, context *cctxt, int args) +{ + function *func = NULL; + long saddr = -1; + long eaddr = -1; + int found = 0; + module *modul; + /* white space skip */ -// still there is question of how do we stop it initially, since -// it must be started before it can get a context. If so, we would -// want it to just run up to an initial entry point you'd think... -// I don't see why we can't set breakpoints before an initial run, -// this does not seem right to me. + if ( args > 0 ) + { + s = trim_left(s); + + if ( isdigit(*s)) + { + saddr = strtol(s,&s,0); + if ( args > 1 ) + { + s = trim_left(s); + + if ( isdigit(*s)) + eaddr = strtol(s,0,0); + } + else + eaddr = saddr+1; + } + } -// line #'s are a bit off too. + if ( eaddr == -1 ) + { + /* no start or only start so dump function */ + if ( saddr == -1 ) + { + func = cctxt->func; + } + else + { + applyToSet(functions,funcInAddr,saddr,&func); + } + if ( func ) + { + printf("Dump of assembler code for function %s:\n",func->sym->name); + printAsmLine(func,func->mod,-1,-1); + printf("End of assembler dump.\n"); + return 0; + } + else + { + if (applyToSet(modules,moduleLineWithAddr,saddr,&modul,NULL)) + { + eaddr = saddr + 5; + printf("Dump of assembler code:\n"); + printAsmLine(NULL,modul,saddr,eaddr); + printf("End of assembler dump.\n"); + return 0; + } + } + } + else + { + if ( args > 1 ) + printf("Dump of assembler code from 0x%08lx to 0x%08lx:\n",saddr,eaddr); + found = 0; + while ( saddr < eaddr ) + { + func = NULL; + if (applyToSet(functions,funcInAddr,saddr,&func)) + { + found = 1; + modul = func->mod; + } + else + { + if ( found ) + break; + if (!applyToSet(modules,moduleLineWithAddr,saddr,&modul,NULL)) + break; + } + saddr = printAsmLine(func,modul,saddr,eaddr) + 1; + } + if( saddr >= eaddr) + { + if ( args > 1 ) + printf("End of assembler dump.\n"); + return 0; + } -#if 0 - gaddr = -1; - goto top ; -#endif } - + fprintf(stderr,"No function contains specified address.\n"); + if( saddr >= 0 ) + { + char lbuf[64]; + sprintf(lbuf,"dis 0x%lx 0 %ld\n",saddr,( eaddr == -1 )?1L:eaddr-saddr); + sendSim(lbuf); + waitForSim(1000, NULL); + fputs(simResponse(),stdout); + } + return 0; +} +/*-----------------------------------------------------------------*/ +/* cmdDisasm1 - disassemble one asm instruction */ +/*-----------------------------------------------------------------*/ +int cmdDisasm1 (char *s, context *cctxt) +{ + return cmdDisasm( s, cctxt, 1); } /*-----------------------------------------------------------------*/ -/* cmdSetUserBp - set break point at the user specified location */ +/* cmdDisasmF - disassemble asm instructions */ /*-----------------------------------------------------------------*/ -int cmdSetUserBp (char *s, context *cctxt) +int cmdDisasmF(char *s, context *cctxt) +{ + return cmdDisasm( s, cctxt, 2); +} + +static int commonSetUserBp(char *s, context *cctxt, char bpType) { char *bp ; function *func = NULL; - + /* user break point location specification can be of the following forms a) - break point at current location @@ -653,114 +1547,260 @@ int cmdSetUserBp (char *s, context *cctxt) c) filename:lineno - line number of the given file e) filename:function- function X in file Y (useful for static functions) f) function - function entry point + g) *addr - break point at address */ if (!cctxt) { - fprintf(stdout,"No symbol table is loaded. Use the \"file\" command.\n"); - return 0; + fprintf(stdout,"No symbol table is loaded. Use the \"file\" command.\n"); + return 0; } - /* white space skip */ - while (*s && isspace(*s)) s++; - - /* null terminate it after stripping trailing blanks*/ - bp = s + strlen(s); - while (bp != s && isspace(*bp)) bp--; - *bp = '\0'; + /* trim left and right */ + s = trim(s); /* case a) nothing */ /* if nothing given then current location : we know the current execution location from the currentContext */ if (! *s ) { - /* if current context is known */ - if (cctxt->func) { - if (srcMode == SRC_CMODE) - /* set the break point */ - setBreakPoint ( cctxt->addr , CODE , USER , userBpCB , - cctxt->func->mod->c_name, cctxt->cline); - else - setBreakPoint ( cctxt->addr , CODE , USER , userBpCB , - cctxt->func->mod->asm_name, cctxt->asmline); - - } - else - fprintf(stderr,"No default breakpoint address now.\n"); - - goto ret ; + /* if current context is known */ + if (cctxt->func) { + Dprintf(D_break, ("commonSetUserBp: a) cctxtaddr:%x \n",cctxt->addr)); + if (srcMode == SRC_CMODE) + /* set the break point */ + setBreakPoint ( cctxt->addr , CODE , bpType , userBpCB , + cctxt->func->mod->c_name, cctxt->cline); + else + setBreakPoint ( cctxt->addr , CODE , bpType , userBpCB , + cctxt->func->mod->asm_name, cctxt->asmline); + + } + else + fprintf(stderr,"No default breakpoint address now.\n"); + + goto ret ; + } + /* case g) *addr */ + if ( *s == '*' && isdigit(*(s+1))) + { + int line = 0; + long braddr = strtol(s+1,0,0); + if (!applyToSet(functions,funcInAddr,braddr,&func)) + { + module *modul; + if (!applyToSet(modules,moduleLineWithAddr,braddr,&modul,&line)) + { + fprintf(stderr,"Address 0x%08lx not exists in code.\n",braddr); + } + else + { + Dprintf(D_break, ("commonSetUserBp: g) addr:%lx \n",braddr)); + setBreakPoint ( braddr , CODE , bpType , userBpCB , + modul->c_name,line); + } + goto ret ; + } + else + { + int line = func->exitline; + if ( !applyToSet(func->cfpoints,lineAtAddr,braddr, + &line,NULL,NULL)) + applyToSet(func->cfpoints,lineNearAddr,braddr,&line,NULL,NULL); + setBreakPoint ( braddr , CODE , bpType , userBpCB , + func->mod->c_name,line); + } + goto ret ; } - /* case b) lineno */ /* check if line number */ - if (isdigit(*s)) { - /* get the lineno */ - int line = atoi(s); - - /* if current context not present then we must get the module - which has main & set the break point @ line number provided - of that module : if current context known then set the bp - at the line number given for the current module - */ - if (cctxt->func) { - if (!cctxt->func->mod) { - if (!applyToSet(functions,funcWithName,"main")) - fprintf(stderr,"Function \"main\" not defined.\n"); - else - setBPatModLine(func->mod,line); - } else - setBPatModLine(cctxt->func->mod,line); - } else { - fprintf(stdout,"No symbol information currently\n"); - } - - goto ret; + if ( !strchr(s,':') && isdigit(*s)) { + /* get the lineno */ + int line = atoi(s) -1; + Dprintf(D_break, ("commonSetUserBp: b) line:%d \n",line)); + if ( line < 0 ) + { + fprintf(stdout,"linenumber <= 0\n"); + goto ret; + } + /* if current context not present then we must get the module + which has main & set the break point @ line number provided + of that module : if current context known then set the bp + at the line number given for the current module + */ + if (cctxt->func) { + if (!cctxt->func->mod) { + if (!applyToSet(functions,funcWithName,"main")) + fprintf(stderr,"Function \"main\" not defined.\n"); + else + setBPatModLine(func->mod,line, bpType); + } else + setBPatModLine(cctxt->func->mod,line, bpType); + } else { + if (list_mod) { + setBPatModLine(list_mod,line, bpType); + } else { + fprintf(stdout,"Sdcdb fails to have module symbol context at %d\n", __LINE__); + } + } + + goto ret; } if ((bp = strchr(s,':'))) { - - module *mod = NULL; - *bp = '\0'; - - if (srcMode == SRC_CMODE) { - if (!applyToSet(modules,moduleWithCName,s,&mod)) { - fprintf (stderr,"No source file named %s.\n",s); - goto ret; - } - } else { - if (!applyToSet(modules,moduleWithAsmName,s,&mod)) { - fprintf (stderr,"No source file named %s.\n",s); - goto ret; - } - } - - /* case c) filename:lineno */ - if (isdigit(*(bp +1))) { - - setBPatModLine (mod,atoi(bp+1)); - goto ret; - - } - /* case d) filename:function */ - if (!applyToSet(functions,funcWithNameModule,bp+1,s,&func)) - fprintf(stderr,"Function \"%s\" not defined.\n",bp+1); - else - setBPatModLine (mod, - (srcMode == SRC_CMODE ? - func->entryline : - func->aentryline)); - - goto ret; + + module *mod = NULL; + *bp = '\0'; + + if (srcMode == SRC_CMODE) { + if (!applyToSet(modules,moduleWithCName,s,&mod)) { + fprintf (stderr,"No source file named %s.\n",s); + goto ret; + } + } else { + if (!applyToSet(modules,moduleWithAsmName,s,&mod)) { + fprintf (stderr,"No source file named %s.\n",s); + goto ret; + } + } + + /* case c) filename:lineno */ + if (isdigit(*(bp +1))) { + Dprintf(D_break, ("commonSetUserBp: c) line:%d \n",atoi(bp+1))); + setBPatModLine (mod,atoi(bp+1)-1,bpType); + goto ret; + + } + /* case d) filename:function */ + if (!applyToSet(functions,funcWithNameModule,bp+1,s,&func)) + fprintf(stderr,"Function \"%s\" not defined.\n",bp+1); + else + Dprintf(D_break, ("commonSetUserBp: d) \n")); + setBPatModLine (mod, + (srcMode == SRC_CMODE ? + func->entryline : + func->aentryline),bpType); + + goto ret; } - + /* case e) function */ + Dprintf(D_break, ("commonSetUserBp: e) \n")); if (!applyToSet(functions,funcWithName,s,&func)) - fprintf(stderr,"Function \"%s\" not defined.\n",s); + fprintf(stderr,"Function \"%s\" not defined.\n",s); else - setBPatModLine(func->mod, - (srcMode == SRC_CMODE ? - func->entryline : - func->aentryline)); + setBPatModLine(func->mod, + (srcMode == SRC_CMODE ? + func->entryline : + func->aentryline),bpType); + + ret: + return 0; +} + +/*-----------------------------------------------------------------*/ +/* cmdSetTmpUserBp - settempory break point at the user specified location */ +/*-----------------------------------------------------------------*/ +int cmdSetTmpUserBp (char *s, context *cctxt) +{ + return commonSetUserBp(s, cctxt, TMPUSER ); +} + +/*-----------------------------------------------------------------*/ +/* cmdSetUserBp - set break point at the user specified location */ +/*-----------------------------------------------------------------*/ +int cmdSetUserBp (char *s, context *cctxt) +{ + return commonSetUserBp(s, cctxt, USER ); +} + +/*-----------------------------------------------------------------*/ +/* cmdJump - set program counter */ +/*-----------------------------------------------------------------*/ +int cmdJump (char *s, context *cctxt) +{ + char *bp; + function *func = NULL; + if (!is_running()) + { + fprintf(stdout,"The program is not running.\n"); + return 0; + } + + /* trim left and right */ + s = trim(s); - ret: + if (! *s ) + { + fprintf(stdout,"No argument: need line or *addr.\n"); + return 0; + } + if ( *s == '*' && isdigit(*(s+1))) + { + unsigned int addr = atoi(s); + if (cctxt && cctxt->func && + cctxt->func->sym->addr <= addr && + cctxt->func->sym->eaddr >= addr) + { + simSetPC(addr); + return 0; + } + fprintf(stdout,"Warning addr 0x%x outside actual function.\n",addr); + simSetPC(addr); + return 0; + } + if (isdigit(*s)) + { + /* get the lineno */ + int line = atoi(s) -1; + if (!cctxt || !cctxt->func || !cctxt->func->mod) + { + fprintf(stderr,"Function not defined.\n"); + return 0; + } + if (line >= cctxt->func->entryline && + line <= cctxt->func->exitline ) + { + simSetPC(cctxt->func->mod->cLines[line]->addr); + return 0; + } + if (line >= cctxt->func->mod->ncLines ) + { + fprintf(stderr,"line not in module.\n"); + return 0; + } + fprintf(stdout,"Warning line %d outside actual function.\n",line+1); + simSetPC(cctxt->func->mod->cLines[line]->addr); + return 0; + } + if ((bp = strchr(s,':'))) + { + int line; + module *mod = NULL; + *bp++ = '\0'; + if (!applyToSet(modules,moduleWithCName,s,&mod)) + { + fprintf (stderr,"No source file named %s.\n",s); + return 0; + } + if (!isdigit(*bp)) + { + fprintf (stderr,"No line number.\n"); + return 0; + } + line = atoi(bp) -1; + if (line >= mod->ncLines ) + { + fprintf(stderr,"line not in module.\n"); + return 0; + } + if ( mod != cctxt->func->mod || + line < cctxt->func->entryline || + line > cctxt->func->exitline ) + { + fprintf(stdout,"Warning line %d outside actual function.\n", + line+1); + } + simSetPC(mod->cLines[line]->addr); + } return 0; } @@ -769,7 +1809,16 @@ int cmdSetUserBp (char *s, context *cctxt) /*-----------------------------------------------------------------*/ int cmdListAsm (char *s, context *cctxt) { - fprintf(stderr,"'listasm' command not yet implemented\n"); + if ( cctxt && cctxt->func) + { + /* actual line */ + if ( cctxt->addr != INT_MAX ) + { + if (printAsmLine(cctxt->func,cctxt->func->mod, + (long)cctxt->addr,(long)cctxt->addr)) + return 0; + } + } return 0; } @@ -778,17 +1827,55 @@ int cmdListAsm (char *s, context *cctxt) /*-----------------------------------------------------------------*/ int cmdSetOption (char *s, context *cctxt) { - while (*s && isspace(*s)) s++; + s = trim_left(s); if (strncmp(s,"srcmode",7) == 0 ) { - if (srcMode == SRC_CMODE) - srcMode = SRC_AMODE; - else - srcMode = SRC_CMODE; - fprintf(stderr,"source mode set to '%s'\n", - (srcMode == SRC_CMODE ? "C" : "asm")); - return 0; + if (srcMode == SRC_CMODE) + srcMode = SRC_AMODE; + else + srcMode = SRC_CMODE; + fprintf(stderr,"source mode set to '%s'\n", + (srcMode == SRC_CMODE ? "C" : "asm")); + return 0; } - + + if (strncmp(s,"listsize ",9) == 0) + { + listlines = strtol(s+9,0,0); + if ( listlines < LISTLINES ) + listlines = LISTLINES; + return 0; + } + +#ifdef SDCDB_DEBUG + if (strncmp(s,"debug ",6) == 0) + { + sdcdbDebug = strtol(s+6,0,0); + return 0; + } +#endif + if (strncmp(s,"variable ",9) == 0) + { + symbol *sym ; + int fmt; + char *rs; + s += 9; + if ( !( rs = preparePrint(s, cctxt, &fmt, &sym ))) + return 0; + s = rs; + while (*s && *s != '=') s++; + *s++ = '\0'; + s = trim_left(s); + if (*s && sym) + { + printOrSetSymValue(sym,cctxt,0,0,0,rs,s,'\0'); + return 0; + } + else + fprintf(stdout,"No new value for \"%s\".\n",s); + return 0; + } + + fprintf(stderr,"'set %s' command not yet implemented\n",s); return 0; } @@ -798,13 +1885,94 @@ int cmdSetOption (char *s, context *cctxt) /*-----------------------------------------------------------------*/ int cmdContinue (char *s, context *cctxt) { - if (!cctxt || !cctxt->func) { - fprintf(stdout,"The program is not being run.\n"); - return 0; + if (!is_running()) { + fprintf(stdout,"The program is not being run.\n"); + return 0; } fprintf(stdout,"Continuing.\n"); simGo(-1); + showfull = 1; + return 0; +} + +/*-----------------------------------------------------------------*/ +/* cmdIgnore - set ignorecount for breakpoint */ +/*-----------------------------------------------------------------*/ +int cmdIgnore (char *s, context *cctxt) +{ + int bpnum, cnt ; + s = trim_left(s); + if (!*s ) + { + fprintf(stdout,"Argument required (breakpoint number).\n"); + return 0; + } + bpnum = strtol(s,&s,10); + s = trim_left(s); + if (!*s ) + { + fprintf(stdout,"Second argument (specified ignore-count) is missing."); + return 0; + } + cnt = strtol(s,0,10); + setUserbpIgnCount(bpnum,cnt); + return 0; +} + +/*-----------------------------------------------------------------*/ +/* cmdCondition - set condition for breakpoint */ +/*-----------------------------------------------------------------*/ +int cmdCondition (char *s, context *cctxt) +{ + int bpnum ; + s = trim_left(s); + if (!*s ) + { + fprintf(stdout,"Argument required (breakpoint number).\n"); + return 0; + } + bpnum = strtol(s,&s,10); + s = trim_left(s); + if (*s) + s = Safe_strdup(s); + else + s = NULL; + setUserbpCondition(bpnum,s); + return 0; +} + +/*-----------------------------------------------------------------*/ +/* cmdCommands - set commands for breakpoint */ +/*-----------------------------------------------------------------*/ +int cmdCommands (char *s, context *cctxt) +{ + int bpnum ; + char *cmds,*line; + s = trim_left(s); + + if (!*s ) + bpnum = getLastBreakptNumber(); + else + bpnum = strtol(s,0,10); + + cmds = NULL; + while ((line = getNextCmdLine())) + { + line = trim_left(line); + if (!strncmp(line,"end",3)) + break; + if (! cmds ) + { + cmds = Safe_strdup(line); + } + else + { + cmds = Safe_realloc( cmds, strlen(cmds) + 1 + strlen(line)); + strcat(cmds,line); + } + } + setUserbpCommand(bpnum,cmds); return 0; } @@ -814,103 +1982,192 @@ int cmdContinue (char *s, context *cctxt) int cmdDelUserBp (char *s, context *cctxt) { int bpnum ; - while (isspace(*s)) s++; - + s = trim_left(s); + if (!*s ) { - if (userBpPresent) { - char buffer[10]; - fprintf (stdout,"Delete all breakpoints? (y or n) "); - fflush(stdout); - fgets(buffer,sizeof(buffer),stdin); - if (toupper(buffer[0]) == 'Y') - deleteUSERbp(-1); - } - return 0; + if (userBpPresent) { + char buffer[10]; + fprintf (stdout,"Delete all breakpoints? (y or n) "); + fflush(stdout); + fgets(buffer,sizeof(buffer),stdin); + if (toupper(buffer[0]) == 'Y') + deleteUSERbp(-1); + } + return 0; } - + /* determine the break point number */ if (sscanf(s,"%d",&bpnum) == 1) - deleteUSERbp(bpnum); + deleteUSERbp(bpnum); return 0; } /*-----------------------------------------------------------------*/ -/* cmdStep - single step thru C source file */ +/* cmdStepi - single step exactly one instruction */ /*-----------------------------------------------------------------*/ -int cmdStep (char *s, context *cctxt) +int cmdStepi (char *s, context *cctxt) { - function *func = NULL; - if (!cctxt || !cctxt->func || !cctxt->func->mod) - fprintf(stdout,"The program is not being run.\n"); - else { - /* if we are @ the end of a function then set - break points at execution points of the - function in the call stack... */ - if (cctxt->addr == cctxt->func->sym->eaddr) { - if ((func = STACK_PEEK(callStack))) { + if (!is_running()) + fprintf(stdout,"The program is not being run.\n"); + else + { + doingSteps = 2; + simGo(2); + doingSteps = 0; + showfull = 1; + } + return 0; +} + +static unsigned line_start_addr(context *ctx, int line) +{ + function *func = ctx->func; + module *mod = func->mod; + unsigned addr; + int nlines; + + if (srcMode == SRC_CMODE) + nlines = mod->ncLines; + else + nlines = mod->nasmLines; + + do { if (srcMode == SRC_CMODE) - applyToSet (func->cfpoints,setStepEPBp,STEP, - func->mod->c_name); + addr = mod->cLines[line]->addr; else - applyToSet (func->afpoints,setStepEPBp,STEP, - func->mod->asm_name); - } + addr = mod->asmLines[line]->addr; + ++line; + } while (addr == 0x7fffffff && line < nlines); + if (addr == 0x7fffffff) + addr = func->sym->eaddr; + return addr; +} + +static unsigned line_end_addr(context *ctx, int line) +{ + function *func = ctx->func; + module *mod = func->mod; + int next_line, nlines; + unsigned start_addr = line_start_addr(ctx, line); + unsigned next_addr = func->sym->eaddr + 1; + unsigned addr; + + if (srcMode == SRC_CMODE) + nlines = mod->ncLines; + else + nlines = mod->nasmLines; + for (next_line = 0; next_line < nlines; next_line++) { + if (next_line == line) + continue; + if (srcMode == SRC_CMODE) + addr = mod->cLines[next_line]->addr; + else + addr = mod->asmLines[next_line]->addr; + if (start_addr < addr && addr < next_addr) + next_addr = addr; + } + return next_addr; +} + +BP_CALLBACK(step_bp_callback) +{ + deleteSTEPbp(); + return 1; +} + +static int do_step(context *ctx, int into) +{ + function *func = ctx->func; + module *mod = func->mod; + srcLine **lines; + srcLine *line; + int nlines; + int start, end; + int start_l; + unsigned len; + unsigned start_addr, end_addr, addr; + unsigned char insn; + unsigned char flags; + + if (srcMode == SRC_CMODE) { + lines = mod->cLines; + nlines = mod->ncLines; + start_l = ctx->cline; } else { - /* set breakpoints at all function entry points - and all exepoints of this functions & for - all functions one up in the call stack */ - - /* all function entry points */ - applyToSet(functions,setStepBp); - - if (srcMode == SRC_CMODE) { - /* for all execution points in this function */ - applyToSet(cctxt->func->cfpoints,setStepEPBp,STEP, - cctxt->func->mod->c_name); - - /* set a break point @ the current function's - exit */ - setBreakPoint (cctxt->func->sym->eaddr, CODE, STEP , - stepBpCB, cctxt->func->mod->c_name, - cctxt->func->exitline); - - /* now break point @ callers execution points */ - if ((func = STACK_PPEEK(callStack))) { - applyToSet (func->cfpoints,setStepEPBp,STEP, - func->mod->c_name); - /* set bp @ callers exit point */ - setBreakPoint (func->sym->eaddr, CODE, STEP , - stepBpCB, func->mod->c_name, - func->exitline); + lines = mod->asmLines; + nlines = mod->nasmLines; + start_l = ctx->asmline; + } + if (start_l == -1) + return 0; + flags = IS_BRANCH|IS_RET; + if (into) + flags |= IS_CALL; + line = lines[start_l]; + start = line_start_addr(ctx, start_l); + end = line_end_addr(ctx, start_l); + + while (start <= ctx->addr && ctx->addr < end) { + insn = 0xff; + for (addr = ctx->addr; addr < end; addr += len) { + insn = simGetValue(addr, 'C', 1); + if (instructions[insn].flags & flags) + break; + len = instructions[insn].len; + if (len == 0) { + fprintf(stderr, "Unknown opcode 0x%02x\n", insn); + return 0; + } } - } else { - /* for all execution points in this function */ - applyToSet(cctxt->func->afpoints,setStepEPBp,STEP, - cctxt->func->mod->asm_name); - - /* set a break point @ the current function's - exit */ - setBreakPoint (cctxt->func->sym->eaddr, CODE, STEP , - stepBpCB, cctxt->func->mod->asm_name, - cctxt->func->aexitline); - - /* now break point @ callers execution points */ - if ((func = STACK_PPEEK(callStack))) { - - applyToSet (func->afpoints,setStepEPBp,STEP, - func->mod->asm_name); - - /* set bp @ callers exit point */ - setBreakPoint (func->sym->eaddr, CODE, STEP , - stepBpCB, func->mod->asm_name, - func->aexitline); + if (addr != ctx->addr) { + setBreakPoint(addr, CODE, STEP, + step_bp_callback, + mod->name, start_l); + doingSteps = 1; + /* run to breakpoint */ + simGo(-1); + doingSteps = 0; + } + /* step over instruction at breakpoint */ + if (start <= ctx->addr && ctx->addr < end) { + doingSteps = 2; + simGo(2); + doingSteps = 0; } - } } + stepBpCB(ctx->addr, NULL, ctx); + showfull = 1; +} + +/*-----------------------------------------------------------------*/ +/* cmdStep - single step thru C source file */ +/*-----------------------------------------------------------------*/ +int cmdStep (char *s, context *cctxt) +{ + function *func = NULL; + + if (!is_running()) + fprintf(stdout,"The program is not being run.\n"); + else + do_step(cctxt, 1); + return 0; +} - simGo(-1); +/*-----------------------------------------------------------------*/ +/* cmdNexti - next instruction but proceed function call */ +/*-----------------------------------------------------------------*/ +int cmdNexti (char *s, context *cctxt) +{ + if (!is_running()) + fprintf(stdout,"The program is not being run.\n"); + else + { + doingSteps = 2; + simGo(1); + doingSteps = 0; + showfull = 1; } return 0; } @@ -924,65 +2181,10 @@ int cmdNext (char *s, context *cctxt) /* next is almost the same as step except we don't we don't set break point for all function entry points */ - if (!cctxt || !cctxt->func || !cctxt->func->mod) - fprintf(stdout,"The program is not being run.\n"); - else { - - /* if we are @ the end of a function then set - break points at execution points of the - function in the call stack... */ - if (cctxt->addr == cctxt->func->sym->eaddr) { - if ((func = STACK_PEEK(callStack))) { - if (srcMode == SRC_CMODE) - applyToSet (func->cfpoints,setStepEPBp,STEP, - func->mod->c_name); - else - applyToSet (func->afpoints,setStepEPBp,STEP, - func->mod->asm_name); - } - } else { - if (srcMode == SRC_CMODE) { - /* for all execution points in this function */ - applyToSet(cctxt->func->cfpoints,setNextEPBp,NEXT, - cctxt->func->mod->c_name); - /* set a break point @ the current function's - exit */ - setBreakPoint (cctxt->func->sym->eaddr, CODE, NEXT , - nextBpCB, cctxt->func->mod->c_name, - cctxt->func->exitline); - - /* now break point @ callers execution points */ - if ((func = STACK_PPEEK(callStack))) { - applyToSet (func->cfpoints,setNextEPBp,NEXT , - func->mod->c_name); - /* set bp @ callers exit point */ - setBreakPoint (func->sym->eaddr, CODE, NEXT , - stepBpCB, func->mod->c_name, - func->exitline); - } - } else { - /* for all execution points in this function */ - applyToSet(cctxt->func->afpoints,setNextEPBp,NEXT, - cctxt->func->mod->asm_name); - /* set a break point @ the current function's - exit */ - setBreakPoint (cctxt->func->sym->eaddr, CODE, NEXT , - nextBpCB, cctxt->func->mod->asm_name, - cctxt->func->aexitline); - - /* now break point @ callers execution points */ - if ((func = STACK_PPEEK(callStack))) { - applyToSet (func->cfpoints,setNextEPBp,NEXT , - func->mod->asm_name); - /* set bp @ callers exit point */ - setBreakPoint (func->sym->eaddr, CODE, NEXT , - stepBpCB, func->mod->asm_name, - func->aexitline); - } - } - simGo(-1); - } - } + if (!is_running()) + fprintf(stdout,"The program is not being run.\n"); + else + do_step(cctxt, 0); return 0; } @@ -992,26 +2194,362 @@ int cmdNext (char *s, context *cctxt) int cmdRun (char *s, context *cctxt) { char buff[10]; - if (!cctxt || !cctxt->func || !cctxt->func->mod) { - fprintf(stdout,"Starting program\n"); - simGo(0); + + if (!is_running()) { + fprintf(stdout,"Starting program\n"); + if ( ! simactive ) + { + fprintf(stdout,"No executable file specified.\nUse the \"file\" command.\n"); + return 0; + } + resetHitCount(); + simGo(0); } else { - - fprintf(stdout, - "The program being debugged has been started already.\n"); - fprintf(stdout,"Start it from the beginning? (y or n) "); - fflush(stdout); - - fgets(buff,sizeof(buff),stdin); - if (toupper(buff[0]) == 'Y') { - simReset(); - simGo(0); - } + + fprintf(stdout, + "The program being debugged has been started already.\n"); + fprintf(stdout,"Start it from the beginning? (y or n) "); + fflush(stdout); + + fgets(buff,sizeof(buff),stdin); + if (toupper(buff[0]) == 'Y') { + simReset(); + resetHitCount(); + simGo(0); + } + } + showfull = 1; + set_running(1); + return 0; +} + +/*----------------------------------------------------------------- + cmdListSymbols - list symbols +|-----------------------------------------------------------------*/ +int cmdListSymbols (char *s, context *cctxt) +{ + int our_verbose = 0; + symbol *sy; + int i; + + if (strstr(s, "v1")) { + our_verbose = 1; + } else if (strstr(s, "v2")) { + our_verbose = 2; + } + + printf("[symbols]\n"); + sy = setFirstItem(symbols); + i = 0; + for (;;) { + if (sy == NULL) + break; + if (our_verbose <= 1) + printf("<%s>", sy->name); + + if (our_verbose > 1) { + printf(" %d) name:%s, size:%d, level:%d block:%d\n", i, + sy->name, sy->size, sy->level, sy->block); + printf(" isonstack:%d, isfunc:%d, offset:%d addr:%d\n", + sy->isonstack, sy->isfunc, sy->offset, sy->addr); + printf(" eaddr:%d, addr_type:%c, type:%p etype:%p\n", + sy->eaddr, sy->addr_type, sy->type, sy->etype); + printf(" scopetype:%c, sname:%s, rname:%s addrspace:%c\n", + sy->scopetype, sy->sname, sy->rname, sy->addrspace); + printf(" next:%p\n", sy->next); + } + ++i; + sy = setNextItem(symbols); + } + printf(" %d symbols\n", i); + return 0; +} + +/*----------------------------------------------------------------- + cmdListFunctions - list functions. +|-----------------------------------------------------------------*/ +int cmdListFunctions (char *s, context *cctxt) +{ + function *f; + int i; + int our_verbose = 0; + + if (strstr(s, "v1")) { + our_verbose = 1; + } else if (strstr(s, "v2")) { + our_verbose = 2; + } + + printf("[functions]\n"); + f = setFirstItem(functions); + i = 0; + while (f != NULL) { + if (our_verbose) { + printf(" %d) sym:%p, fname:%s, modName:%s, mod:%p\n", i, + f->sym, f->sym->name, f->modName, f->mod); + printf(" entryline:%d, aentryline:%d, exitline:%d, aexitline:%d\n", + f->entryline, f->aentryline, f->exitline, f->aexitline); + printf(" cfpoints:%p, afpoints:%p, laddr:%x, lline:%d\n", + f->cfpoints, f->afpoints, f->laddr, f->lline); + } + else { + printf("<%s>", f->sym->name); + } + ++i; + f = setNextItem(functions); } + printf(" %d functions\n", i); + return 0; +} + +/*----------------------------------------------------------------- + cmdListModules - list modules. +|-----------------------------------------------------------------*/ +int cmdListModules (char *s, context *cctxt) +{ + module *m; + srcLine *cs, *as; + int i, mi; + int our_verbose = 0; + + if (strstr(s, "v1")) { + our_verbose = 1; + } else if (strstr(s, "v2")) { + our_verbose = 2; + } + + printf("[modules]\n"); + m = setFirstItem(modules); + mi = 0; + for (;;) { + if (m == NULL) + break; + + if (our_verbose >= 0) { + printf(" %d) cfullname:%s, afullname:%s, name:%s\n", ++mi, + m->cfullname, m->afullname, m->name); + printf(" c_name:%s, asm_name:%s, ncLines:%d, nasmLines:%d\n", + m->c_name, m->asm_name, m->ncLines, m->nasmLines); + printf(" cLines:%p, asmLines:%p\n", + m->cLines, m->asmLines); + } + if (our_verbose >= 2) { + if (m->ncLines) { + printf(" [cLines] "); + if ( our_verbose) + for (i=0; incLines; i++ ) { + cs = m->cLines[i]; + printf(" (%d) addr:%x, block:%d, level:%d, src:%s\n", + i, cs->addr, cs->block, cs->level, cs->src); + } + if (!our_verbose) + printf("%d records", i); + } + if (m->nasmLines) { + printf(" [asmLines] "); + if ( our_verbose) + for (i=0; inasmLines; i++ ) { + as = m->asmLines[i]; + printf(" (%d) addr:%x, block:%d, level:%d, src:%s\n", + i, as->addr, as->block, as->level, as->src); + } + if (!our_verbose) + printf("%d records", i); + } + printf("\n"); + } + m = setNextItem(modules); + } return 0; } +/*----------------------------------------------------------------- + infoSymbols - This is really just a tool to dump all these + huge program structures out into human readable form. +|-----------------------------------------------------------------*/ +static void infoSymbols(context *ctxt) +{ + int our_verbose = 0; + + printf("[context:%p] func:%p modName:%s addr:%x\n", + ctxt, ctxt->func, ctxt->modName, ctxt->addr); + + printf(" cline:%d asmline:%d block:%d level:%d\n", + ctxt->cline, ctxt->asmline, ctxt->block, ctxt->level); + + printf("[globals] currCtxt:%p, modules:%p, functions:%p symbols:%p\n", + currCtxt, modules, functions, symbols); + printf(" nStructs:%d, structs:%p, ssdirl:%s\n", + nStructs, structs, ssdirl); + + /**************** modules *******************/ + { + module *m; + srcLine *cs, *as; + int i, mi; + printf("[modules]\n"); + m = setFirstItem(modules); + mi = 0; + for (;;) { + if (m == NULL) + break; + printf(" %d) cfullname:%s, afullname:%s, name:%s\n", ++mi, + m->cfullname, m->afullname, m->name); + printf(" c_name:%s, asm_name:%s, ncLines:%d, nasmLines:%d\n", + m->c_name, m->asm_name, m->ncLines, m->nasmLines); + printf(" cLines:%p, asmLines:%p\n", + m->cLines, m->asmLines); + i = 0; + if (m->cLines) { + cs = m->cLines[i++]; + printf(" [cLines] "); + while (cs) { + if (our_verbose) + printf(" (%d) addr:%x, block:%d, level:%d, src:%s\n", + i, cs->addr, cs->block, cs->level, cs->src); + cs = m->cLines[i++]; + } + if (!our_verbose) + printf("%d records", i); + } + i = 0; + if (m->asmLines) { + as = m->asmLines[i++]; + printf(" [asmLines] "); + while (as) { + if (our_verbose) + printf(" (%d) addr:%x, block:%d, level:%d, src:%s\n", + i, as->addr, as->block, as->level, as->src); + as = m->asmLines[i++]; + } + if (!our_verbose) + printf("%d records", i); + } + printf("\n"); + + m = setNextItem(modules); + } + } + + /**************** functions *******************/ + { + function *f; + int i; + printf("[functions]\n"); + f = setFirstItem(functions); + i = 0; + for (;;) { + if (f == NULL) + break; + if (our_verbose) { + printf(" %d) sym:%p, modName:%s, mod:%p\n", i, + f->sym, f->modName, f->mod); + printf(" entryline:%d, aentryline:%d, exitline:%d, aexitline:%d\n", + f->entryline, f->aentryline, f->exitline, f->aexitline); + printf(" cfpoints:%p, afpoints:%p, laddr:%x, lline:%d\n", + f->cfpoints, f->afpoints, f->laddr, f->lline); + } + ++i; + f = setNextItem(functions); + } + if (!our_verbose) + printf(" %d functions\n", i); + } + + /**************** symbols *******************/ + { + symbol *s; + int i; + printf("[symbols]\n"); + s = setFirstItem(symbols); + i = 0; + for (;;) { + if (s == NULL) + break; + if (our_verbose) { + printf(" %d) name:%s, size:%d, level:%d block:%d\n", i, + s->name, s->size, s->level, s->block); + printf(" isonstack:%d, isfunc:%d, offset:%d addr:%d\n", + s->isonstack, s->isfunc, s->offset, s->addr); + printf(" eaddr:%d, addr_type:%c, type:%p etype:%p\n", + s->eaddr, s->addr_type, s->type, s->etype); + printf(" scopetype:%c, sname:%s, rname:%s addrspace:%c\n", + s->scopetype, s->sname, s->rname, s->addrspace); + printf(" next:%p\n", s->next); + } + ++i; + s = setNextItem(symbols); + } + if (!our_verbose) + printf(" %d symbols\n", i); + } + +} + +/*-----------------------------------------------------------------*/ +/* infoRegisters - print register information */ +/*-----------------------------------------------------------------*/ +static void infoRegisters( int all, context *ctxt) +{ + static int regaddrs[] = {0x81,0x82,0x83,0xb8,0xd0,0xe0,0xf0,0}; + unsigned long val; + int i,j,*r; + + i = simGetValue (0xd0,'I',1); + fprintf(stdout,"IP : 0x%04X RegisterBank %d:\nR0-7:",ctxt->addr,(i>>3)&3); + for ( j = 0; j < 8 ; j++ ) + { + val = simGetValue (j,'R',1); + fprintf(stdout," 0x%02lX",val); + } + fprintf(stdout,"\n"); + val = simGetValue (0xe0,'I',1); + fprintf(stdout,"ACC : 0x%02lX %lu %c\n",val,val,(isprint(val) ? (char)val : '.')); + val = simGetValue (0xf0,'I',1); + fprintf(stdout,"B : 0x%02lX %lu %c\n",val,val,(isprint(val) ? (char)val : '.')); + val = simGetValue (0x82,'I',2); + fprintf(stdout,"DPTR: 0x%04lX %lu\n",val,val); + val = simGetValue (0x81,'I',1); + fprintf(stdout,"SP : 0x%02lX (0x%04lX)\n",val,simGetValue (val-1,'B',2)); + fprintf(stdout,"PSW : 0x%02X | CY : %c | AC : %c | OV : %c | P : %c\n", + i,(i&0x80)?'1':'0',(i&0x40)?'1':'0',(i&4)?'1':'0',(i&1)?'1':'0'); + if ( all ) + { + fprintf(stdout,"Special Function Registers:\n"); + r = regaddrs; + for ( i = 0x80 ; i < 0x100 ; i++ ) + { + symbol *sym = NULL; + if ( *r && *r == i ) + { + /* skip normal registers */ + r++ ; + continue; + } + if (applyToSetFTrue(sfrsymbols,symWithAddr,i,'I',&sym)) + { + val = simGetValue (sym->addr,sym->addrspace,sym->size); + fprintf(stdout,"%s : 0x%02lx",sym->name,val); + if ( !(i & 0x07 )) + { + for ( j = 0 ; j < 8 ; j++ ) + { + sym = NULL; + if (applyToSetFTrue(sfrsymbols,symWithAddr,i+j,'J',&sym)) + { + //val = simGetValue (sym->addr,sym->addrspace,sym->size); + fprintf(stdout," %s=%c",sym->name,(val&1)? '1':'0'); + } + val >>= 1; + } + } + fprintf(stdout,"\n"); + } + } + } +} + /*-----------------------------------------------------------------*/ /* infoStack - print call stack information */ /*-----------------------------------------------------------------*/ @@ -1019,46 +2557,141 @@ static void infoStack(context *ctxt) { function *func ; int i = 0 ; - - STACK_STARTWALK(callStack) ; - while ((func = STACK_WALK(callStack))) { - - fprintf(stdout,"#%d 0x%04x %s () at %s:%d\n",i++, - func->laddr,func->sym->name, - func->mod->c_name,func->lline); + context *ctx, my_context; + unsigned int bp, pc, addr = ctxt->addr; + int status; + + for (status = frameStart(&bp,&pc); status; status = frameNext(&bp, &pc)) { + ctx = discoverContext(pc, NULL, &my_context); + if (ctx) { + func = ctx->func; + Dprintf(D_break, ("break: infoStack: %s 0x%02x\n",func->sym->name, bp)); + + fprintf(stdout,"#%d 0x%08x in %s () at %s:%d\n",i++, + pc,func->sym->name, + func->mod->c_name,func->lline+1); + } else { + fprintf(stdout,"#%d 0x%08x\n", i++, pc); + } } + if ( !i ) + fprintf(stdout,"no stack.\n"); +} +/*-----------------------------------------------------------------*/ +/* cmdWhere - where command */ +/*-----------------------------------------------------------------*/ +int cmdWhere(char *s, context *cctxt) +{ + infoStack(cctxt); + return 0; } + +static int infomode = 0; /*-----------------------------------------------------------------*/ /* cmdInfo - info command */ /*-----------------------------------------------------------------*/ int cmdInfo (char *s, context *cctxt) { - while (isspace(*s)) s++; + /* trim left and_right*/ + s = trim(s); /* list all break points */ - if (strcmp(s,"break") == 0) { - listUSERbp(); - return 0; + if (strncmp(s,"break",5) == 0) { + listUSERbp(); + return 0; } /* info frame same as frame */ - if (strcmp(s,"frame") == 0) { - cmdFrame (s,cctxt); - return 0; + if (strncmp(s,"frame",5) == 0) { + cmdFrame (s+5,cctxt); + return 0; } + if (strncmp(s,"line",4) == 0) { + infomode=1; + cmdListSrc (s+4,cctxt); + return 0; + } + if (strncmp(s,"source",6) == 0) + { + module *m; + if ( s[6] == 's' ) + { + int k = 0; + fprintf(stdout,"Source files for which symbols have been read in:\n\n"); + for (m = setFirstItem(modules); m ; m = setNextItem(modules)) + { + fprintf(stdout,"%s%s, %s",k ? ", ":"",m->cfullname, m->afullname); + k = 1; + } + fprintf(stdout,"\n"); + } + else + { + if (!cctxt || !cctxt->func || !cctxt->func->mod) + { + fprintf(stdout,"No source file loaded\n"); + return 0; + } + m = cctxt->func->mod; + fprintf(stdout,"Current source file is %s\n",m->c_name); + fprintf(stdout,"Located in %s\n",m->cfullname); + fprintf(stdout,"Contains %d lines.\nSource language is c.\n", + m->ncLines); + } + return 0; + } + if (strcmp(s,"functions") == 0) + { + function *f; + module *m = NULL; + fprintf(stdout,"All defined functions:\n"); + for ( f = setFirstItem(functions); f ; f = setNextItem(functions)) + { + if ( f->mod != m ) + { + m = f->mod; + fprintf(stdout,"\nFile %s\n", m->c_name); + } + fprintf(stdout,"%s();\n",f->sym->name); + } + return 0; + } /* info stack display call stack */ if (strcmp(s,"stack") == 0) { - infoStack(cctxt); - return 0; + infoStack(cctxt); + showfull = 1; + return 0; } /* info stack display call stack */ if (strcmp(s,"registers") == 0) { - fprintf(stdout,"%s",simRegs()); - return 0; + infoRegisters(0,cctxt); + return 0; + } + + /* info stack display call stack */ + if (strcmp(s,"all-registers") == 0) + { + infoRegisters(1,cctxt); + return 0; + } + + /* info stack display call stack */ + if (strcmp(s,"symbols") == 0) { + /* dump out symbols we have read in */ + fprintf(stdout,"Dumping symbols...\n"); + infoSymbols(cctxt); + return 0; + } + + if (strcmp(s,"variables") == 0) { + /* dump out symbols we have read in */ + fprintf(stdout,"Dumping symbols...\n"); + infoSymbols(cctxt); + return 0; } fprintf(stdout,"Undefined info command: \"%s\". Try \"help\n",s); @@ -1070,9 +2703,9 @@ int cmdInfo (char *s, context *cctxt) /* cmdQuit - quit debugging */ /*-----------------------------------------------------------------*/ int cmdQuit (char *s, context *cctxt) -{ +{ if (simactive) - closeSimulator(); + closeSimulator(); return 1; } @@ -1080,267 +2713,697 @@ int cmdQuit (char *s, context *cctxt) /* cmdListSrc - list src */ /*-----------------------------------------------------------------*/ int cmdListSrc (char *s, context *cctxt) -{ +{ static int currline = 0; int i =0 ; int pline = 0; - static module *mod = NULL; - int llines = listLines; + int llines = listlines; + function *func = NULL; + + + s = trim_left(s); - while (*s && isspace(*s)) s++; - /* if the user has spcified line numer then the line number can be of the following formats LINE - just line number FILE:LINE - filename line number + FILE:LINE,LASTLINE + last line FUNCTION - list a function FILE:FUNCTION - function in file */ - if (!cctxt || !cctxt->func || !cctxt->func->mod) { - fprintf(stdout,"No symbol table is loaded. Use the \"file\" command.\n"); - return 0; - } + if (*s) { - /* case a) LINE */ - if (isdigit(*s)) { - sscanf(s,"%d",&pline); - mod = cctxt->func->mod; - } - else { - char *bp; - function *func = NULL; - - /* if ':' present then FILE:LINE || FILE:FUNCTION */ - if ((bp = strchr(s,':'))) { - *bp = '\0'; - bp ++; - if (isdigit(*bp)) { - /* FILE:LINE */ - if (srcMode == SRC_CMODE) { - if (!applyToSet(modules,moduleWithCName,s,&mod)) { - fprintf (stderr,"No source file named %s.\n",s); - return 0; - } - } else { - if (!applyToSet(modules,moduleWithAsmName,s,&mod)) { - fprintf (stderr,"No source file named %s.\n",s); - return 0; - } - } - sscanf(bp,"%d",&pline); - } else { - /* FILE:FUCTION */ - if (!applyToSet(functions,funcWithNameModule,bp,s,&func)) { - fprintf(stdout,"Function \"%s\" not defined.\n",bp); - return 0; - } - mod = func->mod; - if (srcMode == SRC_CMODE) { - pline = func->entryline; - llines = func->exitline - func->entryline + 1; - } else { - pline = func->aentryline; - llines = func->aexitline - func->aentryline + 1; - } - } - } - else { - /* FUNCTION */ - if (!applyToSet(functions,funcWithName,s,&func)) { - fprintf(stderr,"Function \"%s\" not defined.\n",s); - return 0; - } - else { - mod = func->mod; - if (srcMode == SRC_CMODE) { - pline = func->entryline; - llines = func->exitline - func->entryline + 1; - } else { - pline = func->aentryline; - llines = func->aexitline - func->aentryline + 1; - } - } - } - } + /* case a) LINE */ + if (isdigit(*s)) { + if (!cctxt || !cctxt->func || !cctxt->func->mod) { + if (!list_mod) { + fprintf(stdout,"Sdcdb fails to have a proper context at %d.\n", __LINE__); + return 0; + } + } + else + list_mod = cctxt->func->mod; + pline = strtol(s,&s,10) - 1; + if (s && (s = strchr(s,','))) + { + /* LINE,LASTLINE */ + llines = strtol(s+1,0,10); + if ( llines > 0 ) + llines -= pline+1; + else + llines = listlines; + } + } + else { + char *bp; + + /* if ':' present then FILE:LINE || FILE:FUNCTION */ + if ((bp = strchr(s,':'))) { + *bp = '\0'; + bp ++; + if (isdigit(*bp)) { + /* FILE:LINE */ + list_mod=NULL; /* bug fix 2-09-02, moduleWithCName expects mod to be null */ + if (srcMode == SRC_CMODE) { + if (!applyToSet(modules,moduleWithCName,s,&list_mod)) { + fprintf (stderr,"No c source file named %s.\n",s); + return 0; + } + } else { + if (!applyToSet(modules,moduleWithAsmName,s,&list_mod)) { + fprintf (stderr,"No source file named %s.\n",s); + return 0; + } + } + pline = strtol(bp,&bp,10) - 1; + if (bp && (bp = strchr(bp,','))) + { + /* FILE:LINE,LASTLINE */ + llines = strtol(bp+1,0,10); + if ( llines > 0 ) + llines -= pline+1; + else + llines = listlines; + } + } else { + /* FILE:FUCTION */ + if (!applyToSet(functions,funcWithNameModule,bp,s,&func)) { + fprintf(stdout,"Function \"%s\" not defined.\n",bp); + return 0; + } + list_mod = func->mod; + if (srcMode == SRC_CMODE) { + pline = func->entryline; + llines = func->exitline - func->entryline + 1; + } else { + pline = func->aentryline; + llines = func->aexitline - func->aentryline + 1; + } + } + } + else { + /* FUNCTION */ + if (*s == '\'') + { + /* 'FUNCTION' */ + s++ ; + if ((bp = strrchr(s,'\''))) + { + *bp = '\0'; + } + + } + if (!applyToSet(functions,funcWithName,s,&func)) { + fprintf(stderr,"Function \"%s\" not defined.\n",s); + return 0; + } + else { + list_mod = func->mod; + if (srcMode == SRC_CMODE) { + pline = func->entryline; + llines = func->exitline - func->entryline + 1; + } else { + pline = func->aentryline; + llines = func->aexitline - func->aentryline + 1; + } + } + } + } } else { - /* if no line specified & we had listed - before then continue from that listing */ - if (currline) - pline = currline ; - else { - mod = cctxt->func->mod; - if (srcMode == SRC_CMODE) - pline = cctxt->cline; - else - pline = cctxt->asmline; - } + /* if no line specified & we had listed + before then continue from that listing */ + if (currline) + pline = currline ; + else { + if (!cctxt || !cctxt->func || !cctxt->func->mod) { + fprintf(stdout,"Missing context at %d. Try list filename:lineno\n", __LINE__); + return 0; + } + list_mod = cctxt->func->mod; + if (srcMode == SRC_CMODE) + pline = cctxt->cline; + else + pline = cctxt->asmline; + } + } + + if (!list_mod) { + fprintf(stdout,"Sdcdb fails to have a valid module context at %d.\n", __LINE__); + return 0; + } + + if ( pline < 0 ) + return 0; + if ( infomode ) + { + unsigned firstaddr , lastaddr ; + if ( pline >= list_mod->ncLines ) + pline = cctxt->cline; + firstaddr = lastaddr = list_mod->cLines[pline]->addr; + if (!func && cctxt && cctxt->func ) + func = cctxt->func; + fprintf(stdout,"Line %d of \"%s\" starts at address 0x%08x <%s+%d>", + pline+1, + list_mod->c_name, lastaddr, + func ? func->sym->name : "?", + func ? lastaddr -func->sym->addr : 0); + llines = pline +1; + for ( ; pline < list_mod->ncLines; pline++ ) + { + if ( list_mod->cLines[pline]->addr > lastaddr ) + { + lastaddr = list_mod->cLines[pline]->addr -1; + break; + } + } + fprintf(stdout," and ends at 0x%08x <%s+%d>.\n", + lastaddr, + func ? func->sym->name : "?", + func ? lastaddr -func->sym->addr : 0); + infomode=0; + if ( func ) + fprintf(stdout,"\032\032%s:%d:1:beg:0x%08x\n", + canonname(func->mod->cfullname), + llines,firstaddr); + else + showfull=1; + return 0; } - for ( i = 0 ; i < llines ; i++ ) { - if (srcMode == SRC_CMODE) { - if ( (pline + i) >= mod->ncLines ) - break; - fprintf(stdout,"%d\t%s",pline + i, - mod->cLines[pline +i]->src); - } else { - if ( (pline + i) >= mod->nasmLines ) - break; - fprintf(stdout,"%d\t%s",pline + i, - mod->asmLines[pline +i]->src); - } + if (srcMode == SRC_CMODE) { + if ( (pline + i) >= list_mod->ncLines ) + break; + fprintf(stdout,"%d\t%s",pline + i, + list_mod->cLines[pline +i]->src); + } else { + if ( (pline + i) >= list_mod->nasmLines ) + break; + fprintf(stdout,"%d\t%s",pline + i, + list_mod->asmLines[pline +i]->src); + } } currline = pline + i ; return 0; } +static unsigned long getValBasic(symbol *sym, link *type, char *val) +{ + char *s; + union + { + float f; + unsigned long val; + long sval; + struct { + unsigned short lo; + unsigned short hi; + } i; + unsigned char b[4]; + }v; + + if (IS_FLOAT(type)) + v.f = strtod(val,NULL); + else + if (IS_PTR(type)) + v.val = strtol(val,NULL,0); + else + { + if (IS_INTEGRAL(type)) + { + link *etype; + if ( type->next ) + etype = type->next; + else + etype = type; + if (IS_CHAR(etype)) + { + if (( s = strchr(val,'\''))) + { + if ( s[1] == '\\' ) + v.b[0] = strtol(s+2,NULL,8); + else + v.b[0] = s[1]; + } + else + { + v.b[0] = strtol(val,NULL,0); + } + } + else + if (IS_INT(etype)) + if (IS_LONG(etype)) + v.val = strtol(val,NULL,0); + else + v.i.lo = strtol(val,NULL,0); + else + v.val = strtol(val,NULL,0); + } + else + v.val = strtol(val,NULL,0); + } + return v.val; +} + +/*-----------------------------------------------------------------*/ +/* printFmtInteger - print value in bin,oct,dez or hex */ +/*-----------------------------------------------------------------*/ +static void printFmtInteger(char *deffmt,int fmt, long val, + int sign, int size) +{ + static char digits[] = + { + '0' , '1' , '2' , '3' , '4' , '5' , + '6' , '7' , '8' , '9' , 'a' , 'b' , + 'c' , 'd' , 'e' , 'f' , 'g' , 'h' + }; + static int radixOfFormat[] = { 0 , 2, 8 ,10, 16 }; + static int olenOfSize[] = { 0 , 3, 6 , 8, 11 }; + char buf[40]; + char negative = 0; + int charPos = 38; + int radix; + + if ( fmt == FMT_NON || fmt == FMT_DEZ ) + { + fprintf(stdout,deffmt,val); + return; + } + radix = radixOfFormat[fmt]; + + /* + if ( sign && val < 0 ) + negative = 1; + */ + + if (!negative) + val = -val; + + buf[39] = '\0'; + while (val <= -radix) + { + buf[charPos--] = digits[-(val % radix)]; + val = val / radix; + } + buf[charPos] = digits[-val]; + + switch ( fmt ) + { + case FMT_OCT: + radix = olenOfSize[size]; + break; + case FMT_HEX: + radix = size << 1; + break; + case FMT_BIN: + radix = size << 3; + break; + } + + while (charPos > 39 - radix ) + { + buf[--charPos] = '0'; + } + switch ( fmt ) + { + case FMT_OCT: + if ( buf[charPos] != '0' ) + buf[--charPos] = '0'; + break; + case FMT_HEX: + buf[--charPos] = 'x'; + buf[--charPos] = '0'; + break; + } + if (negative) { + buf[--charPos] = '-'; + } + fputs(&buf[charPos],stdout); +} + /*-----------------------------------------------------------------*/ /* printValBasic - print value of basic types */ /*-----------------------------------------------------------------*/ -static void printValBasic(symbol *sym,unsigned addr,char mem, int size) -{ - union { - float f; - unsigned long val; - long sval; - struct { - short lo; - short hi; - } i; - unsigned char b[4]; - }v; +static void printValBasic(symbol *sym, link *type, + char mem, unsigned addr,int size, int fmt) +{ union { - unsigned char b[4]; - }v1; - + float f; + unsigned long val; + long sval; + struct { + unsigned short lo; + unsigned short hi; + } i; + unsigned char b[4]; + }v; + v.val = simGetValue(addr,mem,size); /* if this a floating point number then */ - if (IS_FLOAT(sym->type)) - fprintf(stdout,"%f",v.f); + if (IS_FLOAT(type)) + fprintf(stdout,"%f",v.f); else - if (IS_PTR(sym->type)) - fprintf(stdout,"0x%x",v.val); - else - if (IS_SPEC(sym->type) && IS_INTEGRAL(sym->type)) { - if (IS_CHAR(sym->etype)) - fprintf(stdout,"'%c' %d 0x%x",v.val,v.val,v.val); - else - if (IS_INT(sym->etype)) - if (IS_LONG(sym->etype)) - if (SPEC_USIGN(sym->etype)) - fprintf(stdout,"%d 0x%x",v.val,v.val); - else - fprintf(stdout,"%d 0x%x",v.sval,v.sval); - else - fprintf(stdout,"%d 0x%x",v.i.lo,v.i.lo); - else - fprintf(stdout,"0x%x",v.val); - } else - fprintf(stdout,"0x%x",v.val); - - + if (IS_PTR(type)) + fprintf(stdout,"0x%0*lx",size<<1,v.val); + else + if (IS_INTEGRAL(type)) + { + link *etype; + if ( type->next ) + etype = type->next; + else + etype = type; + if (IS_CHAR(etype)) + { + if ( isprint(v.val)) + printFmtInteger((SPEC_USIGN(etype)?"0x%02x":"'%c'"), + fmt,(long)v.val,0,size); + else + printFmtInteger((SPEC_USIGN(etype)?"0x%02x":"'\\%o'"), + fmt,(long)v.val,0,size); + } + else + { + if (IS_INT(etype)) + if (IS_LONG(etype)) + if (SPEC_USIGN(etype)) + printFmtInteger("%u",fmt,(long)v.val,0,size); + else + printFmtInteger("%d",fmt,(long)v.sval,1,size); + else + if (SPEC_USIGN(etype)) + printFmtInteger("%u",fmt,(long)v.i.lo,0,size); + else + printFmtInteger("%d",fmt,(long)v.i.lo,1,size); + else + { + if (IS_BITVAR(etype)) + fprintf(stdout,"%c",(v.val?'1':'0')); + else + fprintf(stdout,"0x%0*lx",size<<1,v.val); + } + } + } else + fprintf(stdout,"0x%0*lx",size<<1,v.val); } /*-----------------------------------------------------------------*/ /* printValFunc - prints function values */ /*-----------------------------------------------------------------*/ -static void printValFunc (symbol *sym) +static void printValFunc (symbol *sym, int fmt) { - fprintf(stdout,"print function not yet implemented\n"); + fprintf(stdout,"print function not yet implemented"); +} + +static void +do_indent(int indent) { + while (indent--) + fprintf(stdout, " "); + } /*-----------------------------------------------------------------*/ /* printArrayValue - will print the values of array elements */ /*-----------------------------------------------------------------*/ -static void printArrayValue (symbol *sym, char space, unsigned int addr) +static void printArrayValue (symbol *sym, link *type, + char space, unsigned int addr, int fmt, + int indent) { - link *elem_type = sym->type->next; - int i; - - fprintf(stdout," { "); - for (i = 0 ; i < DCL_ELEM(sym->type) ; i++) { - if (IS_AGGREGATE(elem_type)) { - printValAggregates(sym,elem_type,space,addr); - } else { - printValBasic(sym,addr,space,getSize(elem_type)); - } - addr += getSize(elem_type); - if (i != DCL_ELEM(sym->type) -1) - fprintf(stdout,","); + link *elem_type = type->next; + int i; + int col; + + fprintf(stdout,"{"); + for (i = 0 ; i < DCL_ELEM(type) ; i++) { + if (IS_AGGREGATE(elem_type)) { + printValAggregates(sym,elem_type,space,addr,fmt,indent); + col = 0; + } else { + printValBasic(sym,elem_type,space,addr,getSize(elem_type),fmt); + col++; + } + addr += getSize(elem_type); + if (i != DCL_ELEM(type) -1) { + fprintf(stdout,","); + if (col == 16) { + fprintf(stdout,"\n"); + do_indent(indent); + col = 0; + } } + } - fprintf(stdout,"}\n"); + fprintf(stdout,"}"); } /*-----------------------------------------------------------------*/ /* printStructValue - prints structures elements */ /*-----------------------------------------------------------------*/ -static void printStructValue (symbol *sym,link *type, char space, unsigned int addr) +static void printStructValue (symbol *sym, link *type, + char space, unsigned int addr, int fmt, + int indent) { - symbol *fields = SPEC_STRUCT(type)->fields; - - fprintf(stdout," { "); - while (fields) { - fprintf(stdout,"%s = ",fields->name); - if (IS_AGGREGATE(fields->type)) { - printValAggregates(fields,fields->type,space, addr); - } else { - printValBasic(fields,addr,space,getSize(fields->type)); - } - addr += getSize(fields->type); - fields = fields->next; + symbol *fields = SPEC_STRUCT(type)->fields; + int first = 1; + do_indent (indent); + fprintf(stdout,"{\n"); + while (fields) { + do_indent(indent + 1); + fprintf(stdout,"%s = ", fields->name); + first = 0; + if (IS_AGGREGATE(fields->type)) { + printValAggregates(fields,fields->type,space, addr, fmt, indent + 1); + } else { + printValBasic(fields,fields->type,space,addr,getSize(fields->type), fmt); } - fprintf(stdout,"}\n"); + fprintf(stdout,",\n"); + addr += getSize(fields->type); + fields = fields->next; + } + do_indent(indent); + fprintf(stdout,"}"); } /*-----------------------------------------------------------------*/ /* printValAggregates - print value of aggregates */ /*-----------------------------------------------------------------*/ -static void printValAggregates (symbol *sym, link *type,char space,unsigned int addr) +static void printValAggregates (symbol *sym, link *type, + char space,unsigned int addr, int fmt, + int indent) { - if (IS_ARRAY(type)) { - printArrayValue(sym, space, addr); - return ; - } + if (IS_ARRAY(type)) { + printArrayValue(sym, type, space, addr, fmt, indent); + return ; + } - if (IS_STRUCT(type)) { - printStructValue(sym,sym->type,space, addr); - return; - } + if (IS_STRUCT(type)) { + printStructValue(sym, type, space, addr, fmt, indent); + return; + } } /*-----------------------------------------------------------------*/ -/* printSymValue - print value of a symbol */ +/* printOrSetSymValue - print or set value of a symbol */ /*-----------------------------------------------------------------*/ -static void printSymValue (symbol *sym, context *cctxt) +static int printOrSetSymValue (symbol *sym, context *cctxt, + int flg, int dnum, int fmt, char *rs, + char *val, char cmp ) { + static char fmtChar[] = " todx "; static int stack = 1; - unsigned long val; - /* if it is on stack then compute address & fall thru */ - if (sym->isonstack) { - symbol *bp = symLookup("bp",cctxt); - if (!bp) { - fprintf(stdout,"cannot determine stack frame\n"); - return ; - } + symbol *fields; + link *type; + unsigned int addr; + int size, n; + char *s, *s2; + char save_ch, save_ch2; + int get_member = 0; - sym->addr = simGetValue(bp->addr,bp->addrspace,bp->size) - + sym->offset ; + /* if it is on stack then compute address & fall thru */ + if (sym->isonstack) + { + symbol *bp = symLookup("bp",cctxt); + if (!bp) + { + fprintf(stdout,"cannot determine stack frame\n"); + return 1; + } + + sym->addr = simGetValue(bp->addr,bp->addrspace,bp->size) + + sym->offset ; } - + /* get the value from the simulator and print it */ - fprintf(stdout,"$%d = ",stack++); + switch (flg) + { + case 0: + default: + break; + case 1: + fprintf(stdout,"$%d = ",stack++); + break; + case 2: + fprintf(stdout,"%d: ", dnum); + if ( fmt != FMT_NON ) + fprintf(stdout,"/%c ",fmtChar[fmt]); + fprintf(stdout,"%s%s = ",sym->name,rs); + break; + } + + addr = sym->addr; + type = sym->type; + size = sym->size; + + while ( *rs ) + { + if ( *rs == '[' && (IS_ARRAY(type) || IS_PTR(type))) + { + s = rs+1; + while ( *rs && *rs != ']' ) rs++ ; + save_ch = *rs; + *rs = '\0' ; + if ( ! isdigit(*s )) + { + /* index seems a variable */ + for ( s2 = s; *s2 && ( isalnum( *s2 ) || *s2 == '_'); s2++ ); + save_ch2 = *s2; + if ( *s2 ) + *s2 = '\0'; + fields = symLookup(s,cctxt); + *s2 = save_ch2; + if ( ! fields ) + { + fprintf(stdout,"Unknown variable \"%s\" for index.\n", s); + return 1; + } + /* arrays & structures first */ + if (! IS_INTEGRAL(fields->type)) + { + fprintf(stdout,"Wrong type of variable \"%s\" for index \n", s); + return 1; + } + n = simGetValue(fields->addr,fields->addrspace,getSize(fields->type)); + } + else + { + n = strtol(s,0,0); + } + if ( IS_ARRAY(type) && (n < 0 || n >= DCL_ELEM(type))) + { + fprintf(stdout,"Wrong index %d.\n", n); + return 1; + } + if (IS_PTR(type)) + addr = simGetValue(addr, sym->addrspace, size); + type = type->next; + size = getSize(type); + addr += size * n; + *rs++ = save_ch; + } + else if ( (*rs == '.' || get_member) && IS_STRUCT(type)) + { + s = rs+1; + /* search structure element */ + for ( rs = s; *rs && ( isalnum( *rs ) || *rs == '_'); rs++ ); + save_ch = *rs; + if ( *rs ) + *rs = '\0'; + for (fields = SPEC_STRUCT(type)->fields; fields; fields = fields->next) + { + if (!(strcmp(s,fields->name))) + break; + } + *rs = save_ch; + if ( ! fields ) + { + fprintf(stdout,"Unknown field \"%s\" of structure\n", s); + return 1; + } + type = fields->type; + size = getSize(type); + addr += fields->offset; + } + else if ( *rs == '*' && IS_PTR(type)) + { + addr = simGetValue(addr, sym->addrspace, size); + type = type->next; + size = getSize(type); + rs++; + } + else if ( rs[0] == '-' && rs[1] == '>' && + IS_PTR(type) && IS_STRUCT(type->next)) + { + addr = simGetValue(addr, sym->addrspace, size); + type = type->next; + size = getSize(type); + rs++; + get_member = 1; + continue; + } + else + break; + get_member = 0; + } + /* arrays & structures first */ - if (IS_AGGREGATE(sym->type)) - printValAggregates(sym,sym->type,sym->addrspace,sym->addr); + if (IS_AGGREGATE(type)) + { + if ( val ) + { + fprintf(stdout,"Cannot set/compare aggregate variable\n"); + return 1; + } + else + printValAggregates(sym,type,sym->addrspace,addr,fmt,0); + } else - /* functions */ - if (IS_FUNC(sym->type)) - printValFunc(sym); - else { - printValBasic(sym,sym->addr,sym->addrspace,sym->size); - fprintf(stdout,"\n"); - } + /* functions */ + if (IS_FUNC(type)) + { + if ( !val ) + printValFunc(sym,fmt); + else + return 1; + } + else + { + if ( val ) + { + unsigned long newval; + newval = getValBasic(sym,type,val); + + if ( cmp ) + { + unsigned long lval; + lval = simGetValue(addr,sym->addrspace,size); + switch ( cmp ) + { + case '<' : return ( lval < newval ? 1:0 ); break; + case '>' : return ( lval > newval ? 1:0 ); break; + case 'l' : return ( lval <= newval ? 1:0 ); break; + case 'g' : return ( lval >= newval ? 1:0 ); break; + case '=' : return ( lval == newval ? 1:0 ); break; + case '!' : return ( lval != newval ? 1:0 ); break; + } + } + else + { + if ( sym->addrspace == 'I' && addr == 0xb8 ) + { + /* Symbol with address of IP */ + if ( cctxt ) cctxt->addr = newval; + simSetPC(cctxt->addr); + } + else + simSetValue(addr,sym->addrspace,size,newval); + return 1; + } + } + else + printValBasic(sym,type,sym->addrspace,addr,size,fmt); + } + if ( flg > 0 ) fprintf(stdout,"\n"); + return 0; } /*-----------------------------------------------------------------*/ @@ -1350,18 +3413,18 @@ static void printStructInfo (structdef *sdef) { symbol *field = sdef->fields ; int i = 0 ; - + while (field) { - i += field->offset; - field = field->next; + i += field->offset; + field = field->next; } fprintf(stdout,"%s %s {\n",(i ? "struct" : "union" ), sdef->tag); field = sdef->fields; while (field) { - printTypeInfo (field->type); - fprintf(stdout," %s ;\n",field->name); - field = field->next ; + printTypeInfo (field->type); + fprintf(stdout," %s ;\n",field->name); + field = field->next ; } fprintf(stdout,"}\n"); @@ -1374,100 +3437,243 @@ static void printStructInfo (structdef *sdef) static void printTypeInfo(link *p) { if (!p) - return ; + return ; if (IS_DECL(p)) { - switch (DCL_TYPE(p)) { - case FUNCTION: - printTypeInfo (p->next); - fprintf(stdout,"()"); - break; - case ARRAY: - printTypeInfo (p->next); - fprintf(stdout,"[%d]",DCL_ELEM(p)); - break; - - case IPOINTER: - case PPOINTER: - case POINTER: - printTypeInfo (p->next); - fprintf(stdout,"(_near *)"); - break; - - case FPOINTER: - printTypeInfo (p->next); - fprintf(stdout,"(_xdata *)"); - break; - - case CPOINTER: - printTypeInfo( p->next); - fprintf(stdout,"(_code *)"); - break; - - case GPOINTER: - printTypeInfo( p->next); - fprintf(stdout,"(_generic *)"); - break; - } + switch (DCL_TYPE(p)) { + case FUNCTION: + printTypeInfo (p->next); + fprintf(stdout,"()"); + break; + case ARRAY: + printTypeInfo (p->next); + fprintf(stdout,"[%d]",DCL_ELEM(p)); + break; + + case IPOINTER: + case PPOINTER: + case POINTER: + printTypeInfo (p->next); + fprintf(stdout,"(_near *)"); + break; + + case FPOINTER: + printTypeInfo (p->next); + fprintf(stdout,"(_xdata *)"); + break; + + case CPOINTER: + printTypeInfo( p->next); + fprintf(stdout,"(_code *)"); + break; + + case GPOINTER: + printTypeInfo( p->next); + fprintf(stdout,"(_generic *)"); + break; + } } else { - switch (SPEC_NOUN(p)) { /* depending on the specifier type */ - case V_INT: - (IS_LONG(p) ? fputs("long ",stdout) : - ( IS_SHORT(p) ? fputs("short ",stdout) : - fputs("int ",stdout))) ; - break; - case V_FLOAT: - fputs("float ",stdout); - break; + switch (SPEC_NOUN(p)) { /* depending on the specifier type */ + case V_INT: + (IS_LONG(p) ? fputs("long ",stdout) : + ( IS_SHORT(p) ? fputs("short ",stdout) : + fputs("int ",stdout))) ; + break; + case V_FLOAT: + fputs("float ",stdout); + break; + + case V_CHAR: + fputs ("char ",stdout); + break; + + case V_VOID: + fputs("void ",stdout); + break; + + case V_STRUCT: + printStructInfo (SPEC_STRUCT(p)); + break; + + case V_SBIT: + fputs("sbit ",stdout); + break; + + case V_BIT: + fprintf(stdout,": %d" ,SPEC_BLEN(p)); + break; + } + } +} - case V_CHAR: - fputs ("char ",stdout); - break; +/*-----------------------------------------------------------------*/ +/* conditionIsTrue - compare variable with constant value */ +/*-----------------------------------------------------------------*/ +int conditionIsTrue( char *s, context *cctxt) +{ + symbol *sym = NULL; + int fmt; + char *rs, *dup, cmp_char; + dup = s = Safe_strdup(s); + if ( !( rs = preparePrint(s, cctxt, &fmt, &sym )) || !sym) + fmt = 1; + else if (!( s = strpbrk(rs,"<>=!"))) + fmt = 1; + else + { + cmp_char = *s; + *s++ = '\0'; + if ( *s == '=' ) + { + /* if <= or >= an other char is used + * == or != not checked in switch + */ + switch( cmp_char ) + { + case '>': cmp_char = 'g' ; break; + case '<': cmp_char = 'l' ; break; + } + s++ ; + } + s = trim_left(s); + fmt = printOrSetSymValue(sym,cctxt,0,0,0,rs,s,cmp_char); + } + Safe_free(dup); + return fmt; +} - case V_VOID: - fputs("void ",stdout); - break; +/*-----------------------------------------------------------------*/ +/* cmdPrint - print value of variable */ +/*-----------------------------------------------------------------*/ +int cmdPrint (char *s, context *cctxt) +{ + symbol *sym ; + int fmt; + char *rs; + if ( !( rs = preparePrint(s, cctxt, &fmt, &sym ))) + return 0; + + if ( sym ) + { + printOrSetSymValue(sym,cctxt,1,0,fmt,rs,NULL,'\0'); + } + return 0; +} - case V_STRUCT: - printStructInfo (SPEC_STRUCT(p)); - break; +/*-----------------------------------------------------------------*/ +/* cmdOutput - print value of variable without number and newline */ +/*-----------------------------------------------------------------*/ +int cmdOutput (char *s, context *cctxt) +{ + symbol *sym ; + int fmt; + char *rs; + if ( !( rs = preparePrint(s, cctxt, &fmt, &sym ))) + return 0; + + if ( sym ) + { + printOrSetSymValue(sym,cctxt,0,0,fmt,rs,NULL,'\0'); + } + return 0; +} - case V_SBIT: - fputs("sbit ",stdout); - break; +/** find display entry with this number */ - case V_BIT: - fprintf(stdout,": %d" ,SPEC_BLEN(p)); - break; - } +DEFSETFUNC(dsymWithNumber) +{ + dsymbol *dsym = item; + V_ARG(int , dnum); + V_ARG(dsymbol **,dsymp); + + if ( dsym->dnum == dnum ) + { + *dsymp = dsym; + return 1; } + return 0; } /*-----------------------------------------------------------------*/ -/* cmdPrint - print value of variable */ +/* displayAll - display all valid variables */ /*-----------------------------------------------------------------*/ -int cmdPrint (char *s, context *cctxt) -{ +void displayAll(context *cctxt) +{ + dsymbol *dsym; + symbol *sym; + if ( !dispsymbols ) + return; + for (dsym = setFirstItem(dispsymbols); + dsym ; + dsym = setNextItem(dispsymbols)) + { + if ( (sym = symLookup(dsym->name,cctxt))) + printOrSetSymValue(sym,cctxt,2,dsym->dnum,dsym->fmt, + dsym->rs,NULL,'\0'); + } +} + +/*-----------------------------------------------------------------*/ +/* cmdDisplay - display value of variable */ +/*-----------------------------------------------------------------*/ +int cmdDisplay (char *s, context *cctxt) +{ + static int dnum = 1; symbol *sym ; - char *bp = s+strlen(s) -1; + int fmt; + char *rs; + if ( !( rs = preparePrint(s, cctxt, &fmt, &sym ))) + { + displayAll(cctxt); + return 0; + } - while (isspace(*s)) s++; - if (!*s) return 0; - while (isspace(*bp)) bp--; - bp++ ; - *bp = '\0'; + if ( sym ) + { + dsymbol *dsym = (dsymbol *)Safe_calloc(1,sizeof(dsymbol)); + dsym->dnum = dnum++ ; + dsym->name = sym->name; + dsym->fmt = fmt; + dsym->rs = gc_strdup(rs); + addSetHead(&dispsymbols,dsym); + } + return 0; +} - if (!cctxt || !cctxt->func) { - fprintf(stdout,"No symbol \"%s\" in current context.\n", - s); - return 0; +/*-----------------------------------------------------------------*/ +/* cmdUnDisplay - undisplay value of variable */ +/*-----------------------------------------------------------------*/ +int cmdUnDisplay (char *s, context *cctxt) +{ + dsymbol *dsym; + int dnum; + + s = trim_left(s); + if (!*s) + { + for (dsym = setFirstItem(dispsymbols); + dsym; + dsym = setNextItem(dispsymbols)) + { + Safe_free(dsym->rs); + Safe_free(dsym); + } + deleteSet(&dispsymbols); + return 0; } - if ((sym = symLookup(s,cctxt))) { - printSymValue(sym,cctxt); - } else { - fprintf(stdout, - "No symbol \"%s\" in current context.\n", - s); + while ( s && *s ) + { + dnum = strtol(s,&s,10); + if (applyToSetFTrue(dispsymbols,dsymWithNumber,dnum,&dsym)) + { + deleteSetItem(&dispsymbols,dsym); + Safe_free(dsym->rs); + Safe_free(dsym); + } + else + { + fprintf(stdout,"Arguments must be display numbers.\n"); + } } return 0; } @@ -1476,41 +3682,32 @@ int cmdPrint (char *s, context *cctxt) /* cmdPrintType - print type of a variable */ /*-----------------------------------------------------------------*/ int cmdPrintType (char *s, context *cctxt) -{ - symbol *sym ; - char *bp = s+strlen(s) -1; +{ + symbol *sym ; - while (isspace(*s)) s++; + /* trim left and right */ + s = trim(s); if (!*s) return 0; - while (isspace(*bp)) bp--; - bp++ ; - *bp = '\0'; - - if (!cctxt || !cctxt->func) { - fprintf(stdout,"No symbol \"%s\" in current context.\n", - s); - return 0; - } if ((sym = symLookup(s,cctxt))) { - printTypeInfo(sym->type); - fprintf(stdout,"\n"); + printTypeInfo(sym->type); + fprintf(stdout,"\n"); } else { - fprintf(stdout, - "No symbol \"%s\" in current context.\n", - s); + fprintf(stdout, + "No symbol \"%s\" in current context.\n", + s); } - return 0; + return 0; } /*-----------------------------------------------------------------*/ /* cmdClrUserBp - clear user break point */ /*-----------------------------------------------------------------*/ int cmdClrUserBp (char *s, context *cctxt) -{ - char *bp ; +{ + char *bp ; function *func = NULL; - + /* clear break point location specification can be of the following forms a) - break point at current location @@ -1521,99 +3718,93 @@ int cmdClrUserBp (char *s, context *cctxt) */ if (!cctxt) { - fprintf(stdout,"No symbol table is loaded. Use the \"file\" command.\n"); - return 0; + fprintf(stdout,"No symbol table is loaded. Use the \"file\" command.\n"); + return 0; } - /* white space skip */ - while (*s && isspace(*s)) s++; - - /* null terminate it after stripping trailing blanks*/ - bp = s + strlen(s); - while (bp != s && isspace(*bp)) bp--; - *bp = '\0'; + /* trim left and right */ + s = trim(s); /* case a) nothing */ /* if nothing given then current location : we know the current execution location from the currentContext */ if (! *s ) { - /* if current context is known */ - if (cctxt->func) - /* clear the break point @ current location */ - clearUSERbp (cctxt->addr); - else - fprintf(stderr,"No default breakpoint address now.\n"); - - goto ret ; + /* if current context is known */ + if (cctxt->func) + /* clear the break point @ current location */ + clearUSERbp (cctxt->addr); + else + fprintf(stderr,"No default breakpoint address now.\n"); + + goto ret ; } /* case b) lineno */ /* check if line number */ if (isdigit(*s)) { - /* get the lineno */ - int line = atoi(s); - - /* if current context not present then we must get the module - which has main & set the break point @ line number provided - of that module : if current context known then set the bp - at the line number given for the current module - */ - if (cctxt->func) { - if (!cctxt->func->mod) { - if (!applyToSet(functions,funcWithName,"main")) - fprintf(stderr,"Function \"main\" not defined.\n"); - else - clearBPatModLine(func->mod,line); - } else - clearBPatModLine(cctxt->func->mod,line); - } - - goto ret; + /* get the lineno */ + int line = atoi(s); + + /* if current context not present then we must get the module + which has main & set the break point @ line number provided + of that module : if current context known then set the bp + at the line number given for the current module + */ + if (cctxt->func) { + if (!cctxt->func->mod) { + if (!applyToSet(functions,funcWithName,"main")) + fprintf(stderr,"Function \"main\" not defined.\n"); + else + clearBPatModLine(func->mod,line); + } else + clearBPatModLine(cctxt->func->mod,line); + } + + goto ret; } if ((bp = strchr(s,':'))) { - - module *mod = NULL; - *bp = '\0'; - - if (!applyToSet(modules,moduleWithCName,s,&mod)) { - fprintf (stderr,"No source file named %s.\n",s); - goto ret; - } - /* case c) filename:lineno */ - if (isdigit(*(bp +1))) { - - clearBPatModLine (mod,atoi(bp+1)); - goto ret; - - } - /* case d) filename:function */ - if (!applyToSet(functions,funcWithNameModule,bp+1,s,&func)) - fprintf(stderr,"Function \"%s\" not defined.\n",bp+1); - else - clearBPatModLine (mod,func->entryline); - - goto ret; + module *mod = NULL; + *bp = '\0'; + + if (!applyToSet(modules,moduleWithCName,s,&mod)) { + fprintf (stderr,"No source file named %s.\n",s); + goto ret; + } + + /* case c) filename:lineno */ + if (isdigit(*(bp +1))) { + + clearBPatModLine (mod,atoi(bp+1)); + goto ret; + + } + /* case d) filename:function */ + if (!applyToSet(functions,funcWithNameModule,bp+1,s,&func)) + fprintf(stderr,"Function \"%s\" not defined.\n",bp+1); + else + clearBPatModLine (mod,func->entryline); + + goto ret; } - + /* case e) function */ if (!applyToSet(functions,funcWithName,s,&func)) - fprintf(stderr,"Function \"%s\" not defined.\n",s); + fprintf(stderr,"Function \"%s\" not defined.\n",s); else - clearBPatModLine(func->mod,func->entryline); + clearBPatModLine(func->mod,func->entryline); - ret: - return 0; + ret: + return 0; } - /*-----------------------------------------------------------------*/ /* cmdSimulator - send command to simulator */ /*-----------------------------------------------------------------*/ int cmdSimulator (char *s, context *cctxt) -{ +{ char tmpstr[82]; if (strlen(s) > 80) { @@ -1623,28 +3814,116 @@ int cmdSimulator (char *s, context *cctxt) strcpy(tmpstr, s); strcat(tmpstr, "\n"); sendSim(tmpstr); - waitForSim(); + waitForSim(200,NULL); fprintf(stdout,"%s",simResponse()); return 0; } +void setMainContext() +{ + function *func = NULL; + currentFrame = 0; + if (!applyToSet(functions,funcWithName,"_main",&func) && + !applyToSet(functions,funcWithName,"main",&func)) + return; + + discoverContext (func->sym->addr, func, currCtxt); +} + +function *needExtraMainFunction() +{ + function *func = NULL; + if (!applyToSet(functions,funcWithName,"_main",&func)) + { + if (applyToSet(functions,funcWithName,"main",&func)) + { + return func; + } + } + return NULL; +} + +static void printFrame() +{ + int i; + function *func = NULL; + function *lastfunc = NULL; + context *ctx, my_context; + unsigned int bp, pc; + int status; + + if ( currentFrame < 0 ) + { + currentFrame = 0; + fprintf(stdout,"Bottom (i.e., innermost) frame selected; you cannot go down.\n"); + return; + } + i = 0; + for (status = frameStart(&bp, &pc); status; status = frameNext(&bp, &pc)) + { + if (i >= currentFrame) + break; + i++; + } + if (i < currentFrame) { + currentFrame = i; + fprintf(stdout,"Initial frame selected; you cannot go up.\n"); + return; + } + ctx = discoverContext(pc, NULL, &my_context); + if (ctx && (func = ctx->func)) { + fprintf(stdout,"#%d 0x%08x in %s () at %s:%d\n", + currentFrame,pc,func->sym->name,func->mod->c_name,func->lline+1); + fprintf(stdout,"\032\032%s:%d:1:beg:0x%08x\n", + canonname(func->mod->cfullname),func->lline+1,func->laddr); + } else { + fprintf(stdout,"#%d 0x%08x\n", + currentFrame,pc); + } +} + + +/*-----------------------------------------------------------------*/ +/* cmdUp - Up command */ +/*-----------------------------------------------------------------*/ +int cmdUp(char *s, context *cctxt) +{ + s = trim_left(s); + if ( *s ) + currentFrame += strtol(s,0,10); + else + currentFrame++ ; + + printFrame(); + return 0; +} + +/*-----------------------------------------------------------------*/ +/* cmdDown - down command */ +/*-----------------------------------------------------------------*/ +int cmdDown(char *s, context *cctxt) +{ + s = trim_left(s); + if ( *s ) + currentFrame -= strtol(s,0,10); + else + currentFrame-- ; + + printFrame(); + return 0; +} /*-----------------------------------------------------------------*/ /* cmdFrame - Frame command */ /*-----------------------------------------------------------------*/ int cmdFrame (char *s, context *cctxt) -{ - function *func ; - - if ((func = STACK_PEEK(callStack))) { - fprintf(stdout,"#0 %s () at %s:%d\n", - func->sym->name,func->mod->c_name,cctxt->cline); +{ + function *func = NULL; + int framenr = 0; - if (cctxt->cline < func->mod->ncLines) - fprintf(stdout,"%d\t%s", - cctxt->cline, - func->mod->cLines[cctxt->cline]->src); - } else - fprintf(stdout,"No stack.\n"); + s = trim_left(s); + if ( *s ) + currentFrame = strtol(s,0,10); + printFrame(); return 0; } @@ -1653,24 +3932,27 @@ int cmdFrame (char *s, context *cctxt) /*-----------------------------------------------------------------*/ int cmdFinish (char *s, context *ctxt) { - if (!ctxt || ! ctxt->func) { - fprintf(stdout,"The program is not running.\n"); - return 0; +#if 0 + if (STACK_EMPTY(callStack)) { + fprintf(stdout,"The program is not running.\n"); + return 0; } +#endif if (srcMode == SRC_CMODE) { - setBreakPoint (ctxt->func->sym->eaddr, CODE, STEP, - stepBpCB, ctxt->func->mod->c_name, - ctxt->func->exitline); + setBreakPoint (ctxt->func->sym->eaddr, CODE, STEP, + stepBpCB, ctxt->func->mod->c_name, + ctxt->func->exitline); } else { - setBreakPoint (ctxt->func->sym->eaddr, CODE, STEP, - stepBpCB, ctxt->func->mod->asm_name, - ctxt->func->aexitline); + setBreakPoint (ctxt->func->sym->eaddr, CODE, STEP, + stepBpCB, ctxt->func->mod->asm_name, + ctxt->func->aexitline); } simGo(-1); + showfull = 1; return 0; - + } @@ -1680,16 +3962,16 @@ int cmdFinish (char *s, context *ctxt) int cmdShow (char *s, context *cctxt) { /* skip white space */ - while (*s && isspace(*s)) s++ ; + s = trim_left(s); if (strcmp(s,"copying") == 0) { - fputs(copying,stdout); - return 0; + fputs(copying,stdout); + return 0; } - + if (strcmp(s,"warranty") == 0) { - fputs(warranty,stdout); - return 0; + fputs(warranty,stdout); + return 0; } return 0;