Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
2dab7b9
Cleaned up my fork
Aug 18, 2017
d132027
Routers modified to allow manual border routing, noc top generator mo…
Aug 27, 2017
cc7111c
Routers modified to allow manual border routing, noc top generator mo…
Aug 27, 2017
ee95228
minor fix left behin in my amend before hitting push
Aug 27, 2017
cc1d97e
VHDL syntetic corrections
Aug 27, 2017
887c7e0
gitignore added
Sep 8, 2017
5641625
integrated dummy border peripherals
Sep 8, 2017
7829a5d
Added SW
b-scherer Sep 12, 2017
15b69f0
TRANSIT Syscall
b-scherer Sep 15, 2017
a24a842
Add files via upload
b-scherer Sep 20, 2017
518f183
Add files via upload
b-scherer Sep 20, 2017
9074f58
reorganized border_router_test into repo
Sep 22, 2017
2a8daaa
rewrote transmit syscall
Sep 22, 2017
967c849
Added the manual packet.
Sep 23, 2017
88e1fa7
Border routing working
Sep 23, 2017
9225a90
integrated andersons changes into tree
Oct 15, 2017
e8d33b3
Restored DMNI legacy reception behaviour
Oct 17, 2017
2a95738
Attempt at fixing DMNI reception
Oct 17, 2017
6e545f8
Fix start_cpu
Oct 17, 2017
92b628a
Fix recv_size and recv_address on dmni
Oct 18, 2017
8208105
atualização das tarefas de envio e recebimento
acsantana Oct 18, 2017
8cf7bc0
Implemented DMMA receive buffer
Oct 19, 2017
778873e
atualização da dmni - fora corrigido alguns erros de sintax
acsantana Oct 19, 2017
c3c3e51
DMNI DMMA Receive Buffer mapped into processor address space
Oct 19, 2017
8d280d8
IPC Implemented
Oct 20, 2017
7e0cb63
implemented task return rotine
Oct 27, 2017
4e70807
Integrated Alzermiro's and Krause's modifications
Oct 27, 2017
69b1e23
Kernel Master restored
Oct 28, 2017
ddc62d9
Fixed boot_task.asm compilation
Oct 28, 2017
110a11c
Melhorias no Testbench
alzemiro51 Oct 31, 2017
6222e8f
Validated
acsantana Nov 1, 2017
0c555c3
LOADER_NETADDR gerado automaticamente
alzemiro51 Nov 1, 2017
705f612
Mudanças na estrutura do .yaml para suporte a tasks
alzemiro51 Nov 6, 2017
942ebca
Resetting dmni receive buffer on cpu kill to receive next task
Nov 8, 2017
177a254
included bareOS
Nov 10, 2017
1d85587
bareOS working
Nov 10, 2017
4abbf07
Corrected typo in DEADBEEF
alzemiro51 Nov 13, 2017
e5289db
Added support to map_pkg.h include to get tasks location
alzemiro51 Nov 13, 2017
3ad0a32
Added comunication primitives
Nov 16, 2017
93e66a0
Merge branch 'master' of github.com:marlls1989/hemps
Nov 16, 2017
ad82e79
Message transmission and bareOS passing pc_test
Nov 16, 2017
5c2b8be
master slave quicksort application added
alzemiro51 Nov 17, 2017
35f851e
fixed a bug in req fifo
alzemiro51 Nov 17, 2017
365ad9c
add testcase for quicksort application deploy
alzemiro51 Nov 17, 2017
c28f697
improvements on sort source code
alzemiro51 Dec 1, 2017
428c9c1
Changes to simplify testcase definition
alzemiro51 Dec 1, 2017
332cb5c
removed unecessary parameters
alzemiro51 Dec 1, 2017
16e6cfd
fixed bug on map_pkg.h generation
alzemiro51 Dec 1, 2017
a750aae
fixed a bug on tasks config file generation
alzemiro51 Dec 1, 2017
e0a6432
Fix bug on send_msg that could potentially induce reception lost
Dec 1, 2017
8746055
Commited applications: mpeg, AES and Synthetic
b-scherer Dec 8, 2017
054fe28
Removed .DS_Store files
Dec 8, 2017
6fa3849
Reverted comm.c to previous implementation due to bug introdution
Dec 8, 2017
c330726
testbench rodando aplicacoes em paralelo
Dec 8, 2017
1722b96
Untabify bareOS source code
Dec 8, 2017
404d937
Permanent fix for bug on send_message
Dec 8, 2017
5e4612b
Merge branch 'master' of https://github.com/marlls1989/hemps
Dec 8, 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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*~
*.pyc
\#*\#
*.o
*.vlw
.DS_Store
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -314,19 +314,19 @@ void AddRoundKey(BYTE state[][4], const WORD w[])
subkey[2] = (w[0] >> 8) & 0xFF;
subkey[3] = (w[0]) & 0xFF;

//Echo(" ");
//Echo("subkey");
//puts(" ");
//puts("subkey");
//for(j=0; j<4;j++){
// Echo(itoh(subkey[j]));
// puts(itoh(subkey[j]));
//}
//Echo(" ");
//puts(" ");
//
//Echo(" ");
//Echo("state");
//puts(" ");
//puts("state");
//for(j=0; j<4;j++){
// Echo(itoh(state[j][0]));
// puts(itoh(state[j][0]));
//}
//Echo(" ");
//puts(" ");

state[0][0] ^= subkey[0];
state[1][0] ^= subkey[1];
Expand Down Expand Up @@ -361,14 +361,14 @@ void AddRoundKey(BYTE state[][4], const WORD w[])
state[3][3] ^= subkey[3];

#ifdef debug_aes_on
Echo(" ");
Echo("AddRoundKey");
puts(" ");
puts("AddRoundKey");
for(i=0; i<4;i++){
for(j=0; j<4;j++){
Echo(itoh(state[j][i]));
puts(itoh(state[j][i]));
}
}
Echo(" ");
puts(" ");
#endif

}
Expand Down Expand Up @@ -402,14 +402,14 @@ void SubBytes(BYTE state[][4])
state[3][3] = aes_sbox[state[3][3] >> 4][state[3][3] & 0x0F];

#ifdef debug_aes_on
Echo(" ");
Echo("SubBytes");
puts(" ");
puts("SubBytes");
for(i=0; i<4;i++){
for(j=0; j<4;j++){
Echo(itoh(state[j][i]));
puts(itoh(state[j][i]));
}
}
Echo(" ");
puts(" ");
#endif

}
Expand Down Expand Up @@ -437,14 +437,14 @@ void InvSubBytes(BYTE state[][4])
state[3][3] = aes_invsbox[state[3][3] >> 4][state[3][3] & 0x0F];

#ifdef debug_aes_on
Echo(" ");
Echo("InvSubBytes");
puts(" ");
puts("InvSubBytes");
for(i=0; i<4;i++){
for(j=0; j<4;j++){
Echo(itoh(state[j][i]));
puts(itoh(state[j][i]));
}
}
Echo(" ");
puts(" ");
#endif

}
Expand Down Expand Up @@ -482,14 +482,14 @@ void ShiftRows(BYTE state[][4])
state[3][1] = t;

#ifdef debug_aes_on
Echo(" ");
Echo("ShiftRows");
puts(" ");
puts("ShiftRows");
for(i=0; i<4;i++){
for(j=0; j<4;j++){
Echo(itoh(state[j][i]));
puts(itoh(state[j][i]));
}
}
Echo(" ");
puts(" ");
#endif


Expand Down Expand Up @@ -523,14 +523,14 @@ void InvShiftRows(BYTE state[][4])
state[3][2] = t;

#ifdef debug_aes_on
Echo(" ");
Echo("InvShiftRows");
puts(" ");
puts("InvShiftRows");
for(i=0; i<4;i++){
for(j=0; j<4;j++){
Echo(itoh(state[j][i]));
puts(itoh(state[j][i]));
}
}
Echo(" ");
puts(" ");
#endif

}
Expand Down Expand Up @@ -635,14 +635,14 @@ void MixColumns(BYTE state[][4])
state[3][3] ^= gf_mul[col[3]][0];

#ifdef debug_aes_on
Echo(" ");
Echo("MixColumns");
puts(" ");
puts("MixColumns");
for(i=0; i<4;i++){
for(j=0; j<4;j++){
Echo(itoh(state[j][i]));
puts(itoh(state[j][i]));
}
}
Echo(" ");
puts(" ");
#endif

}
Expand Down Expand Up @@ -738,14 +738,14 @@ void InvMixColumns(BYTE state[][4])
state[3][3] ^= gf_mul[col[2]][2];
state[3][3] ^= gf_mul[col[3]][5];
#ifdef debug_aes_on
Echo(" ");
Echo("InvMixColumns");
puts(" ");
puts("InvMixColumns");
for(i=0; i<4;i++){
for(j=0; j<4;j++){
Echo(itoh(state[j][i]));
puts(itoh(state[j][i]));
}
}
Echo(" ");
puts(" ");
#endif

}
Expand All @@ -768,12 +768,12 @@ void aes_encrypt(const BYTE in[], BYTE out[], const WORD key[], int keysize)
// column, then row. Accessing an element in C requires row then column. Thus, all state
// references in AES must have the column and row indexes reversed for C implementation.

//Echo(" ");
//Echo("in");
//puts(" ");
//puts("in");
//for(i=0; i<AES_BLOCK_SIZE;i++){
// Echo(itoh(in[i]));
// puts(itoh(in[i]));
//}
//Echo(" ");
//puts(" ");

state[0][0] = in[0];
state[1][0] = in[1];
Expand All @@ -792,47 +792,47 @@ void aes_encrypt(const BYTE in[], BYTE out[], const WORD key[], int keysize)
state[2][3] = in[14];
state[3][3] = in[15];

//Echo(" ");
//Echo("state");
//puts(" ");
//puts("state");
//for(i=0; i<4;i++){
// for(j=0; j<4;j++){
// Echo(itoh(state[j][i]));
// puts(itoh(state[j][i]));
// }
//}
//Echo(" ");
//puts(" ");

// Perform the necessary number of rounds. The round key is added first.
// The last round does not perform the MixColumns step.
AddRoundKey(state,&key[0]);
Echo("ROUND 0 finished.");
puts("ROUND 0 finished.");
SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[4]);
//Echo("ROUND 1 finished.");
//puts("ROUND 1 finished.");
SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[8]);
//Echo("ROUND 2 finished.");
//puts("ROUND 2 finished.");
SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[12]);
//Echo("ROUND 3 finished.");
//puts("ROUND 3 finished.");
SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[16]);
//Echo("ROUND 4 finished.");
//puts("ROUND 4 finished.");
SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[20]);
//Echo("ROUND 5 finished.");
//puts("ROUND 5 finished.");
SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[24]);
//Echo("ROUND 6 finished.");
//puts("ROUND 6 finished.");
SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[28]);
//Echo("ROUND 7 finished.");
//puts("ROUND 7 finished.");
SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[32]);
//Echo("ROUND 8 finished.");
//puts("ROUND 8 finished.");
SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[36]);
//Echo("ROUND 9 finished.");
//puts("ROUND 9 finished.");
if (keysize != 128) {
SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[40]);
//Echo("ROUND 10 finished.");
//puts("ROUND 10 finished.");
SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[44]);
//Echo("ROUND 11 finished.");
//puts("ROUND 11 finished.");
if (keysize != 192) {
SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[48]);
//Echo("ROUND 12 finished.");
//puts("ROUND 12 finished.");
SubBytes(state); ShiftRows(state); MixColumns(state); AddRoundKey(state,&key[52]);
//Echo("ROUND 13 finished.");
//puts("ROUND 13 finished.");
SubBytes(state); ShiftRows(state); AddRoundKey(state,&key[56]);
}
else {
Expand All @@ -842,7 +842,7 @@ void aes_encrypt(const BYTE in[], BYTE out[], const WORD key[], int keysize)
else {
SubBytes(state); ShiftRows(state); AddRoundKey(state,&key[40]);
}
Echo("ROUND Final finished.");
puts("ROUND Final finished.");
// Copy the state to the output array.
out[0] = state[0][0];
out[1] = state[1][0];
Expand All @@ -861,10 +861,10 @@ void aes_encrypt(const BYTE in[], BYTE out[], const WORD key[], int keysize)
out[14] = state[2][3];
out[15] = state[3][3];

//Echo(" ");
//Echo("out");
//puts(" ");
//puts("out");
//for(i=0; i<AES_BLOCK_SIZE;i++){
// Echo(itoh(out[i]));
// puts(itoh(out[i]));
//}
}

Expand Down Expand Up @@ -896,20 +896,20 @@ void aes_decrypt(const BYTE in[], BYTE out[], const WORD key[], int keysize)
if (keysize > 128) {
if (keysize > 192) {
AddRoundKey(state,&key[56]);
Echo("ROUND 0 finished.");
puts("ROUND 0 finished.");
InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[52]);InvMixColumns(state);
InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[48]);InvMixColumns(state);
}
else {
AddRoundKey(state,&key[48]);
Echo("ROUND 0 finished.");
puts("ROUND 0 finished.");
}
InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[44]);InvMixColumns(state);
InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[40]);InvMixColumns(state);
}
else {
AddRoundKey(state,&key[40]);
Echo("ROUND 0 finished.");
puts("ROUND 0 finished.");
}
InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[36]);InvMixColumns(state);
InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[32]);InvMixColumns(state);
Expand All @@ -921,7 +921,7 @@ void aes_decrypt(const BYTE in[], BYTE out[], const WORD key[], int keysize)
InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[8]);InvMixColumns(state);
InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[4]);InvMixColumns(state);
InvShiftRows(state);InvSubBytes(state);AddRoundKey(state,&key[0]);
Echo("ROUND Final finished.");
puts("ROUND Final finished.");

// Copy the state to the output array.
out[0] = state[0][0];
Expand Down
Loading