Fix some path problems

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@602 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/as/mcs51/asnoice.c b/as/mcs51/asnoice.c
index b8de1bb31d2c3f595cb01c2044db70f255fcfbee..acf86b46194adb9a44f1c6e8b020cce2bca13723 100644 (file)
--- a/as/mcs51/asnoice.c
+++ b/as/mcs51/asnoice.c
@@ -35,6 +35,7 @@ char* BaseFileName( int fileNumber )
 
                /* Name starts after any colon or backslash (DOS) */
                p2 = strrchr( p1, '\\' );
+               if (p2 == NULL) p2 = strrchr( p1, '/' );
                if (p2 == NULL) p2 = strrchr( p1, ':' );
                if (p2 == NULL) p2 = p1-1;
                 strcpy( baseName, p2+1 );

diff --git a/as/mcs51/i51mch.c b/as/mcs51/i51mch.c
index 0446fb26fca408c18185f600b5edf63f7a080deb..7af6a135269cb7cc5aff8e6557ffd33ff89bb84a 100644 (file)
--- a/as/mcs51/i51mch.c
+++ b/as/mcs51/i51mch.c
@@ -498,7 +498,7 @@ struct mne *mp;
                        v1 = -3;
                    else   
                        v1 = e1.e_addr - dot.s_addr - 1;
-                       if ((v1 < -128) || (v1 > 127))
+                       if (pass == 2 && ((v1 < -128) || (v1 > 127)))
                                aerr();
                        outab(v1);
                } else {
@@ -535,7 +535,7 @@ struct mne *mp;
                        v1 = -2;
                    else   
                        v1 = e1.e_addr - dot.s_addr - 1;
-                       if ((v1 < -128) || (v1 > 127))
+                       if (pass == 2 && ((v1 < -128) || (v1 > 127)))
                                aerr();
                        outab(v1);
                } else {

diff --git a/as/mcs51/lklex.c b/as/mcs51/lklex.c
index d80b9ae49d82e9fa3856b1707dfb5d8b6ab5e974..7466cabe74ce35f9d70354f49dc529197d4570e7 100644 (file)
--- a/as/mcs51/lklex.c
+++ b/as/mcs51/lklex.c
@@ -142,7 +142,7 @@ char *str;
                if (p < &str[FILSPC-1])
                        *p++ = c;
                c = get();
-       } while (c && (ctype[c] != SPACE));
+       } while (c && ((ctype[c] != SPACE)||(c == ':')||(c == '\\')));
        while (p < &str[FILSPC])
                *p++ = 0;
 }