Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Now able build by MinGW. All warnings were fixed. #584

Merged
merged 17 commits into from
Apr 7, 2017
Merged

Now able build by MinGW. All warnings were fixed. #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f7a7e89
fix wrong libusb extract command
slyshykO Nov 7, 2016
ec8c3f5
merge
slyshykO Nov 7, 2016
c5b0a3c
merge
slyshykO Dec 13, 2016
faf5e30
Merge branch 'master' of https://github.com/texane/stlink
slyshykO Feb 9, 2017
9886b6e
Merge remote-tracking branch 'upstream/master'
Mar 1, 2017
b6013eb
update libusb to 1.0.21 under windows
Mar 1, 2017
d346152
Merge branch 'master' of https://github.com/texane/stlink
slyshykO Mar 1, 2017
978be33
Merge branch 'master' of https://github.com/texane/stlink
slyshykO Mar 17, 2017
161a3a2
Merge branch 'master' of https://github.com/texane/stlink
slyshykO Mar 28, 2017
a31bd6e
fix few -Wformat warnings
slyshykO Apr 2, 2017
431ef2a
add usleep realisation for win32
slyshykO Apr 2, 2017
36022d8
Merge branch 'master' of https://github.com/texane/stlink
slyshykO Apr 4, 2017
56299f6
Merge branch 'master' of https://github.com/texane/stlink
slyshykO Apr 6, 2017
1ed4a2d
Get rid of unused defines in mimgw.h
slyshykO Apr 6, 2017
7595807
fix format warning for mingw
slyshykO Apr 7, 2017
990baff
Add prefix SEMIXOST_ to semihost defines.
slyshykO Apr 7, 2017
b0e85ab
Merge branch 'master' of https://github.com/texane/stlink
slyshykO Apr 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gdbserver/gdb-server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,7 +1428,7 @@ int serve(stlink_t *sl, st_state_t *st) {

reply = calloc(8 * 16 + 1, 1);
for(int i = 0; i < 16; i++)
sprintf(&reply[i * 8], "%08x", htonl(regp.r[i]));
sprintf(&reply[i * 8], "%08x", (uint32_t)htonl(regp.r[i]));

break;

Expand Down
20 changes: 10 additions & 10 deletions src/gdbserver/semihosting.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ int do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) {
DLOG("Do semihosting R0=0x%08x R1=0x%08x\n", r0, r1);

switch (r0) {
case SYS_OPEN:
case SEMIHOST_SYS_OPEN:
{
uint32_t args[3];
uint32_t name_address;
Expand Down Expand Up @@ -220,7 +220,7 @@ int do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) {
free(name);
break;
}
case SYS_CLOSE:
case SEMIHOST_SYS_CLOSE:
{
uint32_t args[1];
int fd;
Expand All @@ -242,7 +242,7 @@ int do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) {
DLOG("Semihosting: return %d\n", *ret);
break;
}
case SYS_WRITE:
case SEMIHOST_SYS_WRITE:
{
uint32_t args[3];
uint32_t buffer_address;
Expand Down Expand Up @@ -300,7 +300,7 @@ int do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) {
free(buffer);
break;
}
case SYS_READ:
case SEMIHOST_SYS_READ:
{
uint32_t args[3];
uint32_t buffer_address;
Expand Down Expand Up @@ -358,13 +358,13 @@ int do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) {
free(buffer);
break;
}
case SYS_ERRNO:
case SEMIHOST_SYS_ERRNO:
{
*ret = (uint32_t)saved_errno;
DLOG("Semihosting: Errno return %d\n", *ret);
break;
}
case SYS_REMOVE:
case SEMIHOST_SYS_REMOVE:
{
uint32_t args[2];
uint32_t name_address;
Expand Down Expand Up @@ -418,7 +418,7 @@ int do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) {
free(name);
break;
}
case SYS_SEEK:
case SEMIHOST_SYS_SEEK:
{
uint32_t args[2];
int fd;
Expand Down Expand Up @@ -446,7 +446,7 @@ int do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) {
DLOG("Semihosting: return %d\n", *ret);
break;
}
case SYS_WRITEC:
case SEMIHOST_SYS_WRITEC:
{
uint8_t c;
if (mem_read_u8(sl, r1, &c) == 0) {
Expand All @@ -457,13 +457,13 @@ int do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret) {
}
break;
}
case SYS_READC:
case SEMIHOST_SYS_READC:
{
uint8_t c = getchar();
*ret = c;
break;
}
case SYS_WRITE0:
case SEMIHOST_SYS_WRITE0:
{
uint8_t buf[WRITE0_BUFFER_SIZE];

Expand Down
50 changes: 25 additions & 25 deletions src/gdbserver/semihosting.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@

#include <stlink.h>

#define SYS_OPEN 0x01
#define SYS_CLOSE 0x02
#define SYS_WRITEC 0x03
#define SYS_WRITE0 0x04
#define SYS_WRITE 0x05
#define SYS_READ 0x06
#define SYS_READC 0x07
#define SYS_ISERROR 0x08
#define SYS_ISTTY 0x09
#define SYS_SEEK 0x0A

#define SYS_FLEN 0x0C
#define SYS_TMPNAM 0x0D
#define SYS_REMOVE 0x0E
#define SYS_RENAME 0x0E
#define SYS_CLOCK 0x10
#define SYS_TIME 0x11

#define SYS_ERRNO 0x13

#define SYS_GET_CMD 0x15
#define SYS_HEAPINFO 0x16

#define SYS_ELAPSED 0x30
#define SYS_TICKFREQ 0x31
#define SEMIHOST_SYS_OPEN 0x01
#define SEMIHOST_SYS_CLOSE 0x02
#define SEMIHOST_SYS_WRITEC 0x03
#define SEMIHOST_SYS_WRITE0 0x04
#define SEMIHOST_SYS_WRITE 0x05
#define SEMIHOST_SYS_READ 0x06
#define SEMIHOST_SYS_READC 0x07
#define SEMIHOST_SYS_ISERROR 0x08
#define SEMIHOST_SYS_ISTTY 0x09
#define SEMIHOST_SYS_SEEK 0x0A

#define SEMIHOST_SYS_FLEN 0x0C
#define SEMIHOST_SYS_TMPNAM 0x0D
#define SEMIHOST_SYS_REMOVE 0x0E
#define SEMIHOST_SYS_RENAME 0x0E
#define SEMIHOST_SYS_CLOCK 0x10
#define SEMIHOST_SYS_TIME 0x11

#define SEMIHOST_SYS_ERRNO 0x13

#define SEMIHOST_SYS_GET_CMD 0x15
#define SEMIHOST_SYS_HEAPINFO 0x16

#define SEMIHOST_SYS_ELAPSED 0x30
#define SEMIHOST_SYS_TICKFREQ 0x31

int do_semihosting (stlink_t *sl, uint32_t r0, uint32_t r1, uint32_t *ret);

Expand Down